Mavenize and more (See below)

Migrate packages to be logical and not broken.
Use Apache Commons Base64 rather than JVM specific version