renamed some files to make it more readable