change names of files to make them more intuitive. add directory for color-pallet
Merge branch 'dev'