de-eclipsed all the files

also, changed names of clarity because class names were confusing
partners