Fixup

updated file structure, colors, typos