Extract modules to dedicated files