Half cleaned

Some classes renamed or removed