Cleaned folder structure