diff --git a/includes/Polyline.php b/src/Polyline.php
similarity index 100%
rename from includes/Polyline.php
rename to src/Polyline.php
diff --git a/includes/WPStrava.php b/src/WPStrava.php
similarity index 100%
rename from includes/WPStrava.php
rename to src/WPStrava.php
diff --git a/includes/WPStrava/API.php b/src/WPStrava/API.php
similarity index 100%
rename from includes/WPStrava/API.php
rename to src/WPStrava/API.php
diff --git a/includes/WPStrava/Activity.php b/src/WPStrava/Activity.php
similarity index 100%
rename from includes/WPStrava/Activity.php
rename to src/WPStrava/Activity.php
diff --git a/includes/WPStrava/ActivityShortcode.php b/src/WPStrava/ActivityShortcode.php
similarity index 100%
rename from includes/WPStrava/ActivityShortcode.php
rename to src/WPStrava/ActivityShortcode.php
diff --git a/includes/WPStrava/ActivityType.php b/src/WPStrava/ActivityType.php
similarity index 100%
rename from includes/WPStrava/ActivityType.php
rename to src/WPStrava/ActivityType.php
diff --git a/includes/WPStrava/Auth.php b/src/WPStrava/Auth.php
similarity index 100%
rename from includes/WPStrava/Auth.php
rename to src/WPStrava/Auth.php
diff --git a/includes/WPStrava/AuthForever.php b/src/WPStrava/AuthForever.php
similarity index 100%
rename from includes/WPStrava/AuthForever.php
rename to src/WPStrava/AuthForever.php
diff --git a/includes/WPStrava/AuthRefresh.php b/src/WPStrava/AuthRefresh.php
similarity index 100%
rename from includes/WPStrava/AuthRefresh.php
rename to src/WPStrava/AuthRefresh.php
diff --git a/includes/WPStrava/Exception.php b/src/WPStrava/Exception.php
similarity index 100%
rename from includes/WPStrava/Exception.php
rename to src/WPStrava/Exception.php
diff --git a/includes/WPStrava/LatestActivities.php b/src/WPStrava/LatestActivities.php
similarity index 100%
rename from includes/WPStrava/LatestActivities.php
rename to src/WPStrava/LatestActivities.php
diff --git a/includes/WPStrava/LatestActivitiesShortcode.php b/src/WPStrava/LatestActivitiesShortcode.php
similarity index 100%
rename from includes/WPStrava/LatestActivitiesShortcode.php
rename to src/WPStrava/LatestActivitiesShortcode.php
diff --git a/includes/WPStrava/LatestActivitiesWidget.php b/src/WPStrava/LatestActivitiesWidget.php
similarity index 100%
rename from includes/WPStrava/LatestActivitiesWidget.php
rename to src/WPStrava/LatestActivitiesWidget.php
diff --git a/includes/WPStrava/LatestMap.php b/src/WPStrava/LatestMap.php
similarity index 100%
rename from includes/WPStrava/LatestMap.php
rename to src/WPStrava/LatestMap.php
diff --git a/includes/WPStrava/LatestMapShortcode.php b/src/WPStrava/LatestMapShortcode.php
similarity index 100%
rename from includes/WPStrava/LatestMapShortcode.php
rename to src/WPStrava/LatestMapShortcode.php
diff --git a/includes/WPStrava/LatestMapWidget.php b/src/WPStrava/LatestMapWidget.php
similarity index 100%
rename from includes/WPStrava/LatestMapWidget.php
rename to src/WPStrava/LatestMapWidget.php
diff --git a/includes/WPStrava/RouteShortcode.php b/src/WPStrava/RouteShortcode.php
similarity index 100%
rename from includes/WPStrava/RouteShortcode.php
rename to src/WPStrava/RouteShortcode.php
diff --git a/includes/WPStrava/Routes.php b/src/WPStrava/Routes.php
similarity index 100%
rename from includes/WPStrava/Routes.php
rename to src/WPStrava/Routes.php
diff --git a/includes/WPStrava/SOM.php b/src/WPStrava/SOM.php
similarity index 100%
rename from includes/WPStrava/SOM.php
rename to src/WPStrava/SOM.php
diff --git a/includes/WPStrava/SOMEnglish.php b/src/WPStrava/SOMEnglish.php
similarity index 100%
rename from includes/WPStrava/SOMEnglish.php
rename to src/WPStrava/SOMEnglish.php
diff --git a/includes/WPStrava/SOMMetric.php b/src/WPStrava/SOMMetric.php
similarity index 100%
rename from includes/WPStrava/SOMMetric.php
rename to src/WPStrava/SOMMetric.php
diff --git a/includes/WPStrava/Settings.php b/src/WPStrava/Settings.php
similarity index 100%
rename from includes/WPStrava/Settings.php
rename to src/WPStrava/Settings.php
diff --git a/includes/WPStrava/StaticMap.php b/src/WPStrava/StaticMap.php
similarity index 100%
rename from includes/WPStrava/StaticMap.php
rename to src/WPStrava/StaticMap.php
diff --git a/includes/autoload.php b/src/autoload.php
similarity index 87%
rename from includes/autoload.php
rename to src/autoload.php
index 863d5df..ca65537 100644
--- a/includes/autoload.php
+++ b/src/autoload.php
@@ -16,7 +16,7 @@ function wpstrava_autoload_classes( $class_name ) {
 	}
 
 	// @TODO Add directory searching if they get created.
-	$file = WPSTRAVA_PLUGIN_DIR . '/includes/' . implode( '/', $parts ) . '.php';
+	$file = WPSTRAVA_PLUGIN_DIR . '/src/' . implode( '/', $parts ) . '.php';
 	if ( file_exists( $file ) ) {
 		include_once $file;
 	}
diff --git a/includes/template-tags.php b/src/template-tags.php
similarity index 100%
rename from includes/template-tags.php
rename to src/template-tags.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 748b9cf..a1df485 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@ if ( ! defined( 'WPSTRAVA_PLUGIN_DIR' ) ) {
 	define( 'WPSTRAVA_PLUGIN_DIR', dirname( __FILE__ ) . '/../' );
 }
 
-require_once dirname( __FILE__ ) . '/../includes/autoload.php';
+require_once dirname( __FILE__ ) . '/../src/autoload.php';
 require_once dirname( __FILE__ ) . '/../vendor/autoload.php';
 
 WP_Mock::bootstrap();
diff --git a/wp-strava.php b/wp-strava.php
index c7e18de..ca69cec 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -36,7 +36,7 @@ if ( ! defined( 'WPSTRAVA_DEBUG' ) ) {
 	define( 'WPSTRAVA_DEBUG', false );
 }
 
-require_once WPSTRAVA_PLUGIN_DIR . 'includes/autoload.php';
+require_once WPSTRAVA_PLUGIN_DIR . 'src/autoload.php';
 
 // Load the plugin and multilingual support.
 function wpstrava_plugin_loaded() {