Moved CPColorPicker elements to their own folder.
Minor formatting fixes.