TEZ-423. Move new re-factor classes to appropriate module. (hitesh)