Renamed files and also halfway through updating how the header is done