Maintenance
#CHANGE: Moved some files
#CHANGE: Tweaked ColorControls rendering