Moved objects into their own folder