Refactor/reorg the Code and Color components