Mass refactoring. Removed unnecessarry classes.