Mavenizing project, break dependencies on internals util classes in tests.
Moving files to fine-grained packages.