Adding Swatch class and moving some code to a BaseTileColor class and cleanup.