Moved some files around. Hopefully fixed some bugs.