Changed File folders. Some errors found