Moved entry maker code to a new file, for easier cleaning.