Reworking of the files to make it clearer what is what