Moving files to make testing easier