Renamed classes to interfaces, unified formatting a bit.