Refactor controller class structure for BSC