Moved project structure around