Reorganised geneos code