Simplified project structure somewhat