deploy class refactor