Work in progress on dependency splitting into modules