Reorganized folder structure and initial version