getting folder structure right