Refactor and addition of files to hold refcatored out objects.