create/use package structure
random cleanups