Moved files around to make it easier to expand the framework