More clean up

cleaned up some files and moved some around blah blah