Renamed some classes, fixed session problem