Use logical class and file names...  Also ran some auto refactor thingy.