Major Refactor and Residence Resource

Think IntelliJ's refactor tools did this...  Will fix.