Removing folder, adding directory and cleaning up the verbiage.