renamed folders and made corrections