diff --git a/pg/sql/0.0.1/05_segmentation.sql b/src/pg/sql/05_segmentation.sql
similarity index 93%
rename from pg/sql/0.0.1/05_segmentation.sql
rename to src/pg/sql/05_segmentation.sql
index b9bca6a..00ced3f 100644
--- a/pg/sql/0.0.1/05_segmentation.sql
+++ b/src/pg/sql/05_segmentation.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION
-  cdb_create_segment (
+  CDB_CreateSegment (
       segment_name TEXT,
       table_name TEXT,
           column_name TEXT,
@@ -14,7 +14,7 @@ AS $$
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION
-  cdb_correlated_variables(
+  CDB_CorrelatedVariables(
     query text,
     geoid_column text DEFAULT 'geoid',
     census_table text DEFAULT 'ml_learning_block_groups_clipped'
@@ -26,7 +26,7 @@ AS $$
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION
-  cdb_predict_segment (
+  CDB_PredictSegment (
       segment_name TEXT,
       geoid_column TEXT DEFAULT 'geoid',
       census_table TEXT DEFAULT 'block_groups'
@@ -40,7 +40,7 @@ $$ LANGUAGE plpythonu;
 
 
 CREATE OR REPLACE FUNCTION
-  cdb_create_and_predict_segment (
+  CDB_CreateAndPredictSegment (
       segment_name TEXT,
       query TEXT,
       target_table TEXT,
diff --git a/src/py/crankshaft/crankshaft/__init__.py b/src/py/crankshaft/crankshaft/__init__.py
index d07e330..bc8e065 100644
--- a/src/py/crankshaft/crankshaft/__init__.py
+++ b/src/py/crankshaft/crankshaft/__init__.py
@@ -1,2 +1,3 @@
 import random_seeds
 import clustering
+import segmentation
diff --git a/python/crankshaft/crankshaft/segmentation/__init__.py b/src/py/crankshaft/crankshaft/segmentation/__init__.py
similarity index 100%
rename from python/crankshaft/crankshaft/segmentation/__init__.py
rename to src/py/crankshaft/crankshaft/segmentation/__init__.py
diff --git a/python/crankshaft/crankshaft/segmentation/segmentation.py b/src/py/crankshaft/crankshaft/segmentation/segmentation.py
similarity index 100%
rename from python/crankshaft/crankshaft/segmentation/segmentation.py
rename to src/py/crankshaft/crankshaft/segmentation/segmentation.py