Changed some folder names
Merge branch 'organize-folders'
Making sure folders adhere to proper naming conventions (no spaces) and that
we are naming things in a useful way.