Move other objects to their own files