refactoring project structure
..