Big ol' package and naming refactor. part 1