Moved java files to new package and altered package statements
Merge branch 'master' of github.com:xiaobai/Nickelheim because alex and I are working in parallel