Did some refactoring. Removed superfluous classes.