modified folder structure