Refactoring the codebase and moved the existing project into the directories