Issue #271: Rearranging the classes in correct packages and removing unnecessary code.
Issue #271: Changing in classes due to the previous refactoring.