Homogenising the file structure

Changed several names of files and functions to reduce the amount has
to be coded in when stating up a new/different file.