project structure refactoring -cont.