more renaming done and fixed packaging