Fixed variable names, file names, updated structure