Extract modules in to their own files