diff --git a/lib/Polyline.php b/includes/Polyline.php
similarity index 100%
rename from lib/Polyline.php
rename to includes/Polyline.php
diff --git a/lib/WPStrava.php b/includes/WPStrava.php
similarity index 100%
rename from lib/WPStrava.php
rename to includes/WPStrava.php
diff --git a/lib/WPStrava/API.php b/includes/WPStrava/API.php
similarity index 100%
rename from lib/WPStrava/API.php
rename to includes/WPStrava/API.php
diff --git a/lib/WPStrava/Activity.php b/includes/WPStrava/Activity.php
similarity index 100%
rename from lib/WPStrava/Activity.php
rename to includes/WPStrava/Activity.php
diff --git a/lib/WPStrava/ActivityShortcode.php b/includes/WPStrava/ActivityShortcode.php
similarity index 100%
rename from lib/WPStrava/ActivityShortcode.php
rename to includes/WPStrava/ActivityShortcode.php
diff --git a/lib/WPStrava/ActivityType.php b/includes/WPStrava/ActivityType.php
similarity index 100%
rename from lib/WPStrava/ActivityType.php
rename to includes/WPStrava/ActivityType.php
diff --git a/lib/WPStrava/Auth.php b/includes/WPStrava/Auth.php
similarity index 100%
rename from lib/WPStrava/Auth.php
rename to includes/WPStrava/Auth.php
diff --git a/lib/WPStrava/AuthForever.php b/includes/WPStrava/AuthForever.php
similarity index 100%
rename from lib/WPStrava/AuthForever.php
rename to includes/WPStrava/AuthForever.php
diff --git a/lib/WPStrava/AuthRefresh.php b/includes/WPStrava/AuthRefresh.php
similarity index 100%
rename from lib/WPStrava/AuthRefresh.php
rename to includes/WPStrava/AuthRefresh.php
diff --git a/lib/WPStrava/Exception.php b/includes/WPStrava/Exception.php
similarity index 100%
rename from lib/WPStrava/Exception.php
rename to includes/WPStrava/Exception.php
diff --git a/lib/WPStrava/LatestActivities.php b/includes/WPStrava/LatestActivities.php
similarity index 100%
rename from lib/WPStrava/LatestActivities.php
rename to includes/WPStrava/LatestActivities.php
diff --git a/lib/WPStrava/LatestActivitiesShortcode.php b/includes/WPStrava/LatestActivitiesShortcode.php
similarity index 100%
rename from lib/WPStrava/LatestActivitiesShortcode.php
rename to includes/WPStrava/LatestActivitiesShortcode.php
diff --git a/lib/WPStrava/LatestActivitiesWidget.php b/includes/WPStrava/LatestActivitiesWidget.php
similarity index 100%
rename from lib/WPStrava/LatestActivitiesWidget.php
rename to includes/WPStrava/LatestActivitiesWidget.php
diff --git a/lib/WPStrava/LatestMapWidget.php b/includes/WPStrava/LatestMapWidget.php
similarity index 100%
rename from lib/WPStrava/LatestMapWidget.php
rename to includes/WPStrava/LatestMapWidget.php
diff --git a/lib/WPStrava/RouteShortcode.php b/includes/WPStrava/RouteShortcode.php
similarity index 100%
rename from lib/WPStrava/RouteShortcode.php
rename to includes/WPStrava/RouteShortcode.php
diff --git a/lib/WPStrava/Routes.php b/includes/WPStrava/Routes.php
similarity index 100%
rename from lib/WPStrava/Routes.php
rename to includes/WPStrava/Routes.php
diff --git a/lib/WPStrava/SOM.php b/includes/WPStrava/SOM.php
similarity index 100%
rename from lib/WPStrava/SOM.php
rename to includes/WPStrava/SOM.php
diff --git a/lib/WPStrava/SOMEnglish.php b/includes/WPStrava/SOMEnglish.php
similarity index 100%
rename from lib/WPStrava/SOMEnglish.php
rename to includes/WPStrava/SOMEnglish.php
diff --git a/lib/WPStrava/SOMMetric.php b/includes/WPStrava/SOMMetric.php
similarity index 100%
rename from lib/WPStrava/SOMMetric.php
rename to includes/WPStrava/SOMMetric.php
diff --git a/lib/WPStrava/Settings.php b/includes/WPStrava/Settings.php
similarity index 100%
rename from lib/WPStrava/Settings.php
rename to includes/WPStrava/Settings.php
diff --git a/lib/WPStrava/StaticMap.php b/includes/WPStrava/StaticMap.php
similarity index 97%
rename from lib/WPStrava/StaticMap.php
rename to includes/WPStrava/StaticMap.php
index 14b4894..341bd6a 100644
--- a/lib/WPStrava/StaticMap.php
+++ b/includes/WPStrava/StaticMap.php
@@ -66,7 +66,7 @@ class WPStrava_StaticMap {
 	 * }
 	 */
 	private static function decode_start_finish( $enc ) {
-		require_once WPSTRAVA_PLUGIN_DIR . 'lib/Polyline.php';
+		require_once WPSTRAVA_PLUGIN_DIR . 'includes/Polyline.php';
 		$points = Polyline::decode( $enc );
 		$points = Polyline::pair( $points );
 		$start  = $points[0];
diff --git a/lib/autoload.php b/includes/autoload.php
similarity index 87%
rename from lib/autoload.php
rename to includes/autoload.php
index c1a9a6c..863d5df 100644
--- a/lib/autoload.php
+++ b/includes/autoload.php
@@ -16,7 +16,7 @@ function wpstrava_autoload_classes( $class_name ) {
 	}
 
 	// @TODO Add directory searching if they get created.
-	$file = WPSTRAVA_PLUGIN_DIR . '/lib/' . implode( '/', $parts ) . '.php';
+	$file = WPSTRAVA_PLUGIN_DIR . '/includes/' . implode( '/', $parts ) . '.php';
 	if ( file_exists( $file ) ) {
 		include_once $file;
 	}
diff --git a/phpcs.xml b/phpcs.xml
index 3fe964c..78c2892 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,7 +8,7 @@
 		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
 	</rule>
 
-	<file>./lib</file>
+	<file>./includes</file>
 	<file>./wp-strava.php</file>
 
 	<exclude-pattern>*/vendor/*</exclude-pattern>
diff --git a/phpunit.xml b/phpunit.xml
index 45eedc3..5cb52bb 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,7 +16,7 @@
 
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">lib</directory>
+            <directory suffix=".php">includes</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1d5410e..24408ee 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__ ) . '/../lib/autoload.php';
+require_once dirname( __FILE__ ) . '/../includes/autoload.php';
 require_once dirname( __FILE__ ) . '/../vendor/autoload.php';
 
 WP_Mock::bootstrap();
diff --git a/wp-strava.php b/wp-strava.php
index 1c08fa9..caa1020 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -35,7 +35,7 @@ if ( ! defined( 'WPSTRAVA_DEBUG' ) ) {
 	define( 'WPSTRAVA_DEBUG', false );
 }
 
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/autoload.php';
+require_once WPSTRAVA_PLUGIN_DIR . 'includes/autoload.php';
 
 // Load the plugin and multilingual support.
 function wpstrava_load_plugin_textdomain() {