Change project structure and package naming to prepare for Maven upload.

Signed-off-by: Carl Benson <carl@magplus.com>