CE-1019 Reorganizing hooks structure to have main setup and separate user hooks class