[IMP] Renamed classes, removed unused files, icons