Move files, fix wording, improve colors