Renaming Coffees to be CoffeeTable
More cleanup
More cleanup / refactoring.