Fix packaging issues.

This is what happens when you are a noob in intellij!