Moved files around

Got rid of some unnecessary folders, and reduced the length of the
directory, removing one useless folder.