Removed unwantRemoved unwanted folders.
Removed unsuded unit tests, probably should have used these but oh well.