Reorganized files again. Also changed Color to use 0-255 values instead of 0.0-1.0