diff --git a/config/config.yaml b/fairseq/config/config.yaml
similarity index 100%
rename from config/config.yaml
rename to fairseq/config/config.yaml
diff --git a/config/model/transformer_lm/transformer_lm_baevski_gbw.yaml b/fairseq/config/model/transformer_lm/transformer_lm_baevski_gbw.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_baevski_gbw.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_baevski_gbw.yaml
diff --git a/config/model/transformer_lm/transformer_lm_baevski_wiki103.yaml b/fairseq/config/model/transformer_lm/transformer_lm_baevski_wiki103.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_baevski_wiki103.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_baevski_wiki103.yaml
diff --git a/config/model/transformer_lm/transformer_lm_big.yaml b/fairseq/config/model/transformer_lm/transformer_lm_big.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_big.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_big.yaml
diff --git a/config/model/transformer_lm/transformer_lm_gbw.yaml b/fairseq/config/model/transformer_lm/transformer_lm_gbw.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_gbw.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_gbw.yaml
diff --git a/config/model/transformer_lm/transformer_lm_gpt.yaml b/fairseq/config/model/transformer_lm/transformer_lm_gpt.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_gpt.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_gpt.yaml
diff --git a/config/model/transformer_lm/transformer_lm_gpt2_big.yaml b/fairseq/config/model/transformer_lm/transformer_lm_gpt2_big.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_gpt2_big.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_gpt2_big.yaml
diff --git a/config/model/transformer_lm/transformer_lm_gpt2_medium.yaml b/fairseq/config/model/transformer_lm/transformer_lm_gpt2_medium.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_gpt2_medium.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_gpt2_medium.yaml
diff --git a/config/model/transformer_lm/transformer_lm_gpt2_small.yaml b/fairseq/config/model/transformer_lm/transformer_lm_gpt2_small.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_gpt2_small.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_gpt2_small.yaml
diff --git a/config/model/transformer_lm/transformer_lm_wiki103.yaml b/fairseq/config/model/transformer_lm/transformer_lm_wiki103.yaml
similarity index 100%
rename from config/model/transformer_lm/transformer_lm_wiki103.yaml
rename to fairseq/config/model/transformer_lm/transformer_lm_wiki103.yaml
diff --git a/fairseq/dataclass/utils.py b/fairseq/dataclass/utils.py
index d73977eda..1efcc5dca 100644
--- a/fairseq/dataclass/utils.py
+++ b/fairseq/dataclass/utils.py
@@ -290,9 +290,6 @@ def convert_namespace_to_omegaconf(args: Namespace) -> DictConfig:
 
     # configs will be in fairseq/config after installation
     config_path = os.path.join("..", "config")
-    if not os.path.exists(config_path):
-        # in case of "--editable" installs we need to go one dir up
-        config_path = os.path.join("..", "..", "config")
 
     with initialize(config_path=config_path):
         composed_cfg = compose("config", overrides=overrides, strict=False)
diff --git a/fairseq_cli/hydra_train.py b/fairseq_cli/hydra_train.py
index 24728c507..ffd3c5cd0 100644
--- a/fairseq_cli/hydra_train.py
+++ b/fairseq_cli/hydra_train.py
@@ -6,6 +6,7 @@
 
 import hydra
 from omegaconf import OmegaConf
+import os
 
 from fairseq.dataclass.initialize import hydra_init
 from fairseq_cli.train import main as pre_main
@@ -19,7 +20,7 @@ import torch
 logger = logging.getLogger(__name__)
 
 
-@hydra.main(config_path="../config", config_name="config")
+@hydra.main(config_path=os.path.join("..", "fairseq", "config"), config_name="config")
 def hydra_main(cfg: FairseqConfig) -> None:
 
     cfg = OmegaConf.create(OmegaConf.to_container(cfg, resolve=True, enum_to_str=True))
diff --git a/setup.py b/setup.py
index 7b13f13e4..572d2b50d 100644
--- a/setup.py
+++ b/setup.py
@@ -222,15 +222,13 @@ def get_files(path, relative_to="fairseq"):
 
 
 try:
-    # symlink config and examples into fairseq package so package_data accepts them
+    # symlink examples into fairseq package so package_data accepts them
     if "build_ext" not in sys.argv[1:]:
-        os.symlink(os.path.join("..", "config"), "fairseq/config")
         os.symlink(os.path.join("..", "examples"), "fairseq/examples")
     package_data = {
-        "fairseq": get_files("fairseq/config") + get_files("fairseq/examples"),
+        "fairseq": get_files("fairseq/examples"),
     }
     do_setup(package_data)
 finally:
     if "build_ext" not in sys.argv[1:]:
-        os.unlink("fairseq/config")
         os.unlink("fairseq/examples")