fixed project structure further