Added defensive Building
Renamed some files