Rename packages in according to module.
Fix deployment descriptors.