cleanup-3

more vestigial file removal and small cleanups to package structure.