organized some classes