WEBCMS-115 - Main refactor complete

Still minor tweeks needed, but stable