Changed file names, functions