Revert "made the structure more conducive to eclipse"

This reverts commit e2a25774ab960f1c0d40b98f63aa73a73724d470.
changed structure for eclipse support
Revert "changed structure for eclipse support"

This reverts commit f3acda93f4a565e9c86ed7c4b00f22a6e467943e.
FINALLY ironed it out and fixed it for java