Fix packages and file names