Refactoring Universal Object & Scene to their own files.