Organize project structure more logically