Removed redundant classes. Refactored and so on.