changed overall project structure