Moved objects into their own files