change file names and package names to avoid conflicts