Added infrastructure files
Renamed file for clarity