Removed curl, and fixed path to subfolders