clean up of manifest file + namespace

fix #11