renamed files and set up calculations file