Moved message bundles

Moved bundles to match the java packages organization