simplify project structure...
simplify project structure... part 2