Refarctoring packages, Logging, minor changes