Moving owner command helpers into their own files

Removing the command file and moving all the requires into default