CRUD Cleanup / SiteMap Building

More work towards a cleaner looking back-end