Moved stuff into folders

Now graphing properly