diff --git a/astroquery/higal/__init__.py b/astroquery/herschel/higal/__init__.py
similarity index 100%
rename from astroquery/higal/__init__.py
rename to astroquery/herschel/higal/__init__.py
diff --git a/astroquery/higal/core.py b/astroquery/herschel/higal/core.py
similarity index 100%
rename from astroquery/higal/core.py
rename to astroquery/herschel/higal/core.py
diff --git a/astroquery/higal/tests/__init__.py b/astroquery/herschel/higal/tests/__init__.py
similarity index 100%
rename from astroquery/higal/tests/__init__.py
rename to astroquery/herschel/higal/tests/__init__.py
diff --git a/astroquery/higal/tests/data/frontpage.html b/astroquery/herschel/higal/tests/data/frontpage.html
similarity index 100%
rename from astroquery/higal/tests/data/frontpage.html
rename to astroquery/herschel/higal/tests/data/frontpage.html
diff --git a/astroquery/higal/tests/data/g49.html b/astroquery/herschel/higal/tests/data/g49.html
similarity index 100%
rename from astroquery/higal/tests/data/g49.html
rename to astroquery/herschel/higal/tests/data/g49.html
diff --git a/astroquery/higal/tests/setup_package.py b/astroquery/herschel/higal/tests/setup_package.py
similarity index 100%
rename from astroquery/higal/tests/setup_package.py
rename to astroquery/herschel/higal/tests/setup_package.py
diff --git a/astroquery/higal/tests/test_higal.py b/astroquery/herschel/higal/tests/test_higal.py
similarity index 100%
rename from astroquery/higal/tests/test_higal.py
rename to astroquery/herschel/higal/tests/test_higal.py
diff --git a/astroquery/higal/tests/test_higal_remote.py b/astroquery/herschel/higal/tests/test_higal_remote.py
similarity index 100%
rename from astroquery/higal/tests/test_higal_remote.py
rename to astroquery/herschel/higal/tests/test_higal_remote.py