cleaner organisation of sources for #355