Renamed a bunch of classes to make them shorter, removed stacked coal