Rename folder + minor fixes.