Moved a bunch of stuff around
Got rid of un-needed file