Initial refactor
removing all package-info.java
fixing test issues after refactoring