Tidy up basics module:
* Move directory up
* Remove unity includes and "include what you use"