Moved all the directories and such so that it makes sense.