Restructured folder and solved 8 more problems