renaming package and getting rid of unnecessary dirs