Devel

Extract some constructs as standalone data and services