Moved objects into separate files