Renamed

Renamed and restructured some classes