Simplified names of modules.
fixes #3
Updated names of packages.