Rearranged HandlerControlFlow and BaseHandler. HandlerControlFlow now only has the very basic methods
Moved all the attributes of class HandlerControlFlow to class BaseHandler