Move Object functions to their own Objects module