Refactor to make color changing easier
Rearrange folder structure