renamed files to make more sense. Fixed git merge that I destroyed