diff --git a/hub/pylintrc b/hub/pylintrc
index 5c790802..4e20cd6b 100644
--- a/hub/pylintrc
+++ b/hub/pylintrc
@@ -60,17 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
+disable=raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
@@ -78,71 +68,9 @@ disable=print-statement,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
         import-error,
         parse-error,
         syntax-error,
-        bad-continuation,
         no-name-in-module
 
 # Enable the message, report, category or checker with the given id(s). You can
diff --git a/setup.py b/setup.py
index 75c316cc..dd15f41c 100644
--- a/setup.py
+++ b/setup.py
@@ -91,28 +91,24 @@ setup(
     ('hub', glob.glob('requirements.txt')),
     ('hub/config', glob.glob('hub/config/*.ini')),
     ('hub/catalog_factories/greenery/ecore_greenery', glob.glob('hub/catalog_factories/greenery/ecore_greenery/*.ecore')),
-    ('hub/data/construction.', glob.glob('hub/data/construction/*')),
-    ('hub/data/customized_imports', glob.glob('hub/data/customized_imports/*.xml')),
-    ('data/geolocation', glob.glob('hub/data/geolocation/*.txt')),
+    ('hub/data/construction', glob.glob('hub/data/construction/*')),
+    ('hub/data/costs', glob.glob('hub/data/costs/montreal_costs.xml')),
+    ('hub/data/customized_imports', glob.glob('hub/data/customized_imports/ashrae_archetypes.xml')),
     ('hub/data/energy_systems', glob.glob('hub/data/energy_systems/*.xml')),
-    ('hub/data/energy_systems', glob.glob('hub/data/energy_systems/*.insel')),
-    ('hub/data/energy_systems', glob.glob('hub/data/energy_systems/*.xlsx')),
-    ('hub/data/energy_systems', glob.glob('hub/data/energy_systems/*.txt')),
-    ('hub/data/energy_systems', glob.glob('hub/data/energy_systems/*.yaml')),
+    ('hub/data/energy_systems/heat_pumps', glob.glob('hub/data/energy_systems/heat_pumps/*.xml')),
+    ('hub/data/energy_systems/heat_pumps', glob.glob('hub/data/energy_systems/heat_pumps/*.insel')),
+    ('hub/data/energy_systems/heat_pumps', glob.glob('hub/data/energy_systems/heat_pumps/*.xlsx')),
+    ('hub/data/energy_systems/heat_pumps', glob.glob('hub/data/energy_systems/heat_pumps/*.txt')),
+    ('hub/data/energy_systems/heat_pumps', glob.glob('hub/data/energy_systems/heat_pumps/*.yaml')),
+    ('hub/data/geolocation', glob.glob('hub/data/geolocation/*.txt')),
     ('hub/data/greenery', glob.glob('hub/data/greenery/*.xml')),
-    ('hub/data/life_cycle_assessment', glob.glob('hub/data/life_cycle_assessment/*.xml')),
-    ('hub/data/schedules', glob.glob('hub/data/schedules/*.xml')),
-    ('hub/data/schedules', glob.glob('hub/data/schedules/*.xlsx')),
-    ('hub/data/schedules/idf_files', glob.glob('hub/data/schedules/idf_files/*.idf')),
-    ('hub/data/sensors', glob.glob('hub/data/sensors/*.json')),
     ('hub/data/usage', glob.glob('hub/data/usage/*.xml')),
     ('hub/data/usage', glob.glob('hub/data/usage/*.xlsx')),
     ('hub/data/weather', glob.glob('hub/data/weather/*.dat')),
     ('hub/data/weather/epw', glob.glob('hub/data/weather/epw/*.epw')),
     ('hub/data/weather', glob.glob('hub/data/weather/*.dat')),
     ('hub/exports/building_energy/idf_files', glob.glob('hub/exports/building_energy/idf_files/*.idf')),
-    ('hub/exports/building_energy/idf_files', glob.glob('hub/exports/building_energy/idf_files/*.idd')),
-    ('hub/helpers/data', glob.glob('hub/helpers/data/quebec_to_hub.json'))
+    ('hub/exports/building_energy/idf_files', glob.glob('hub/exports/building_energy/idf_files/*.idd'))
   ],
 
 )