solve problem with packages and shortening names

revert build.gradle deletion
rename packages