Restructuring, added ColorStorage class.