fixing build issues and renaming some packages