Changed folders to proper names for confusion purposes