Revert "Packages"

This reverts commit c0068a09e5b43130a45a4501743fad2cc5224f6d.

Conflicts:
	Java/.idea/workspace.xml
Revert stash