Removing extra layer of packaging

Removing extra layer of packaging because it made too many classes too
long on my computer.