refactor modules/themes into extensions (suite)