deleted most of the classes
maded some major changes