Still does't build, but cleaning up project structure