Refactoring by moving classes to more detailed packages, added sanity logging in SanityLogger.java