Restructured and Renamed files