restructured structure of source definitions