Moved some files around for easier management.