renaming package
merged in origin master and fixed build files