removed redundant classes in packages, implemented setters and getters