yet more project organisation