project directories refactoring