Moved items around to clean up assets directory.