Rename the stockhandler->handler; move the entity from handler to entity package