Project restructured ready for formatting