Re-organise packages.
Change namespace.