Modificiations to project structure