Project structire refactored
17 files changed