Added package-info & regenerated javadocs, changed package naming scheme
to reflect wider scope of classes in project.