Refactoring folders and structure for the project