Moved project structure around a bit