Moving files around to incorporate into the framework