Clean up time!

Clean the project up when I get home this looks like crap now :-(!