Moved a few things around and simplified the directory