Reorganized classes, made it easier