Refactoring: project dir structure