Reorganised make function, to make inclusion of derived module more straightforward