Class package renaming

Address issue #2.