no longer use separate files for cppa < 0.9