Package cleanup, mixed up during refactor