refactor file names, amcat functions name changes