add default color
refactor into folders