Fixed build and project structure