Removed redundant class. Fixed packages