Reorganized/renamed the packages according to java standards