refactore modules/themes into extensions (suite)