Renamed some classes. Changed commands