fix makefiles to have the right files in them and standardise them so they are easier to merge with hybrid ones