Adjusting folder names, clean up HTML markup