Removed redundant code due to refactoring and renamed some classes to better suit their purpose