Renamed source files and moved fields in the header to improve readability