Proper start of project, restructured hierarchy.