Renamed Files and improved code