Updates to project structure