changed names of 2 files and modified a few things