Restructured and renamed files
Added newly named files