Add gradle build. This time *really* fix directory structue.
Fix package name