Structure revised and removed classes that didn't make sense.