cleanup folder structure