changed package name and other file names