Moved files around to make it more managable