reoganized classes directory