Code revisions

Package renames, classes, cleanup and renames