deleted duplicated RequestHandler and updated some classes
Updated some classes