Some folders added. Minor fixes.