refactoring project folder structure