Major reorg - renaming and refocusing around resources