Changed module name.
Full qualification not needed.
Merged package contents into module.