Moved files around and cleaned up a bit