start cleaning up and moving includes to the right place
lots of bad include references cleaned up now
more include path fixes for tests too