Move some more files around to clean up and prepare for testing