Fixed path
Renamed some classes