diff --git a/README.md b/README.md
index 02e0ecc7947feeb985983cc6aa2d4e6823b56d04..2feb667dc16e858f7ffb6eb57350216b8b836fa4 100644
--- a/README.md
+++ b/README.md
@@ -24,11 +24,10 @@ this package:
 ```sh
 git clone https://gitlab.mpcdf.mpg.de/nomad-lab/python-common.git
 cd python-common
-pip install -r requirements.txt
 pip install -e .
 ```
 
-Then download the metainfo definitions to the same folder where the
+Then download the metainfo definitions into the same folder where the
 'python-common' repository was cloned:
 
 ```sh
diff --git a/nomadcore.egg-info/SOURCES.txt b/nomadcore.egg-info/SOURCES.txt
index 249c01751cdf1b0d1530c6a1edb03d0336eaf8fb..8730a43bca7f623ecd9065869221b75413468e15 100644
--- a/nomadcore.egg-info/SOURCES.txt
+++ b/nomadcore.egg-info/SOURCES.txt
@@ -26,7 +26,6 @@ nomadcore/parsing/annotator.py
 nomadcore/parsing/baseclasses.py
 nomadcore/parsing/basic_meta_info.py
 nomadcore/parsing/caching_backend.py
-nomadcore/parsing/compact_sha.py
 nomadcore/parsing/configurationreading.py
 nomadcore/parsing/csvparsing.py
 nomadcore/parsing/local_backend.py
@@ -42,5 +41,6 @@ nomadcore/utils/GromosTopoObjects.py
 nomadcore/utils/MDDataAccess.py
 nomadcore/utils/__init__.py
 nomadcore/utils/activatelogging.py
+nomadcore/utils/compact_sha.py
 nomadcore/utils/json_support.py
 nomadcore/utils/utils.py
\ No newline at end of file
diff --git a/nomadcore/constants/MetaData.txt b/nomadcore/constants/metadata.txt
similarity index 100%
rename from nomadcore/constants/MetaData.txt
rename to nomadcore/constants/metadata.txt
diff --git a/nomadcore/metainfo/calculate_meta_info_overrides.py b/nomadcore/metainfo/calculate_metainfo_overrides.py
similarity index 100%
rename from nomadcore/metainfo/calculate_meta_info_overrides.py
rename to nomadcore/metainfo/calculate_metainfo_overrides.py
diff --git a/nomadcore/metainfo/load_meta_info.py b/nomadcore/metainfo/load_metainfo.py
similarity index 100%
rename from nomadcore/metainfo/load_meta_info.py
rename to nomadcore/metainfo/load_metainfo.py
diff --git a/nomadcore/metainfo/local_meta_info.py b/nomadcore/metainfo/local_metainfo.py
similarity index 100%
rename from nomadcore/metainfo/local_meta_info.py
rename to nomadcore/metainfo/local_metainfo.py
diff --git a/nomadcore/parsing/model_meta_info.py b/nomadcore/metainfo/model_metainfo.py
similarity index 100%
rename from nomadcore/parsing/model_meta_info.py
rename to nomadcore/metainfo/model_metainfo.py
diff --git a/nomadcore/metainfo/normalize_meta_info.py b/nomadcore/metainfo/normalize_metainfo.py
similarity index 100%
rename from nomadcore/metainfo/normalize_meta_info.py
rename to nomadcore/metainfo/normalize_metainfo.py
diff --git a/nomadcore/parsing/baseclasses.py b/nomadcore/parsing/base_classes.py
similarity index 99%
rename from nomadcore/parsing/baseclasses.py
rename to nomadcore/parsing/base_classes.py
index d6f791f7c871883fac0080055e2c1af9f4424bea..fa5c54378ac10f1fb2e2dc9dedd720be8da59d8d 100644
--- a/nomadcore/parsing/baseclasses.py
+++ b/nomadcore/parsing/base_classes.py
@@ -13,11 +13,11 @@ from abc import ABCMeta, abstractmethod
 from nomadcore.parsing import unit_conversion
 from nomadcore.parsing.simple_parser import mainFunction
 from nomadcore.parsing.local_backend import LocalBackend
-from nomadcore.metainfo.local_meta_info import load_metainfo
+from nomadcore.metainfo.local_metainfo import load_metainfo
 from nomadcore.parsing.caching_backend import CachingLevel
 from nomadcore.parsing.simple_parser import extractOnCloseTriggers, extractOnOpenTriggers
 from nomadcore.parsing.caching_backend import ActiveBackend
-import nomadcore.utils.activatelogging
+import nomadcore.utils.activate_logging
 from future.utils import with_metaclass
 logger = logging.getLogger("nomad")
 
diff --git a/nomadcore/parsing/basic_meta_info.py b/nomadcore/parsing/basic_metainfo.py
similarity index 100%
rename from nomadcore/parsing/basic_meta_info.py
rename to nomadcore/parsing/basic_metainfo.py
diff --git a/nomadcore/parsing/configurationreading.py b/nomadcore/parsing/coordinate_reader.py
similarity index 100%
rename from nomadcore/parsing/configurationreading.py
rename to nomadcore/parsing/coordinate_reader.py
diff --git a/nomadcore/parsing/csvparsing.py b/nomadcore/parsing/csv_reader.py
similarity index 100%
rename from nomadcore/parsing/csvparsing.py
rename to nomadcore/parsing/csv_reader.py
diff --git a/nomadcore/utils/GromosTopoObjects.py b/nomadcore/parsing/gromos_topo_objects.py
similarity index 100%
rename from nomadcore/utils/GromosTopoObjects.py
rename to nomadcore/parsing/gromos_topo_objects.py
diff --git a/nomadcore/utils/MDDataAccess.py b/nomadcore/parsing/md_data_access.py
similarity index 100%
rename from nomadcore/utils/MDDataAccess.py
rename to nomadcore/parsing/md_data_access.py
diff --git a/nomadcore/parsing/MetaInfoStorage.py b/nomadcore/parsing/metainfo_storage.py
similarity index 100%
rename from nomadcore/parsing/MetaInfoStorage.py
rename to nomadcore/parsing/metainfo_storage.py
diff --git a/nomadcore/parsing/SmartParserCommon.py b/nomadcore/parsing/smart_parser_common.py
similarity index 100%
rename from nomadcore/parsing/SmartParserCommon.py
rename to nomadcore/parsing/smart_parser_common.py
diff --git a/nomadcore/parsing/SmartParserDictionary.py b/nomadcore/parsing/smart_parser_dictionary.py
similarity index 100%
rename from nomadcore/parsing/SmartParserDictionary.py
rename to nomadcore/parsing/smart_parser_dictionary.py
diff --git a/nomadcore/utils/activatelogging.py b/nomadcore/utils/activate_logging.py
similarity index 100%
rename from nomadcore/utils/activatelogging.py
rename to nomadcore/utils/activate_logging.py