minor refactoring project structure