updated file names, packages etc