Cleaned up folder structure and reorganized files