Moved files around to clean up the code directory structure