fixed issues caused by refactoring and fixed wrong package names in manifest files