Reorganized  folder structure