renamed folders to be consistent