Renamed all classes & fixed security stuff