Fixing up project structure