Re-org: easier to navigate directories. Remove java packages.