further polished folder structure