diff --git a/bootstrap.php b/bootstrap.php
index f5bfb9c8..5d20b6f0 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -2,6 +2,11 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+use NewfoldLabs\WP\Module\Performance\Cache\CacheFeatureHooks;
+use NewfoldLabs\WP\Module\Installer\Services\PluginInstaller;
+
+use function NewfoldLabs\WP\ModuleLoader\container;
+
 if ( function_exists( 'add_filter' ) ) {
 	add_filter(
 		'newfold/features/filter/register',
@@ -11,6 +16,23 @@ function ( $features ) {
 	);
 }
 
-new PerformanceFeatureHooks();
+// Activate Jetpack Boost on fresh installation.
+if ( function_exists( 'add_action' ) ) {
+	add_action(
+		'activated_plugin',
+		function ( $plugin ) {
+			if ( container()->plugin()->basename === $plugin &&
+				container()->has( 'isFreshInstallation' ) &&
+				container()->get( 'isFreshInstallation' ) &&
+				isset( $_REQUEST['action'] ) && // phpcs:ignore WordPress.Security.NonceVerification
+				'activate' === $_REQUEST['action'] // phpcs:ignore WordPress.Security.NonceVerification
+			) {
+				PluginInstaller::install( 'jetpack-boost', true );
+			}
+		}
+	);
+}
+
+new CacheFeatureHooks();
 
 require_once __DIR__ . '/includes/BurstSafetyMode/init.php';
diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 74697b07..effed3b2 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -9,13 +9,16 @@ const CacheExclusion = ( { methods, constants } ) => {
 	const [ isError, setIsError ] = methods.useState( false );
 	const [ isSaved, setIsSaved ] = methods.useState( false );
 	const [ currentValue, setCurrentValue ] = methods.useState(
-		methods.NewfoldRuntime.sdk.cacheExclusion
+		methods.NewfoldRuntime.sdk.cache.exclusion
 	);
+
 	const [ cacheExclusion, setCacheExclusion ] = methods.useState(
-		methods.NewfoldRuntime.sdk.cacheExclusion
+		methods.NewfoldRuntime.sdk.cache.exclusion
 	);
+
+
 	const apiUrl = methods.NewfoldRuntime.createApiUrl(
-		'/newfold-performance/v1/cache-exclusion/update'
+		'/newfold-performance/v1/cache/settings'
 	);
 
 	const handleCacheExclusionChange = ( e ) => {
@@ -45,18 +48,17 @@ const CacheExclusion = ( { methods, constants } ) => {
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
-			CacheExclusion: cacheExclusion,
-		} );
 
 		methods.makeNotice(
-			'cache-exlusion-notice',
+			'cache-exclusion-notice',
 			constants.text.cacheExclusionTitle,
 			! isError ? constants.text.cacheExclusionSaved : isError,
 			! isError ? 'success' : 'error',
 			5000
 		);
+
+		setIsSaved( false );
+
 	}, [ isSaved, isError ] );
 
 	return (
diff --git a/components/cacheSettings/index.js b/components/cacheSettings/index.js
index 383bd46a..9f9b70d4 100644
--- a/components/cacheSettings/index.js
+++ b/components/cacheSettings/index.js
@@ -3,7 +3,14 @@ import { Container, RadioGroup } from '@newfold/ui-component-library';
 
 const CacheSettings = ( { methods, constants, Components } ) => {
 	const [ cacheLevel, setCacheLevel ] = methods.useState(
-		constants.store.cacheLevel
+		methods.NewfoldRuntime.sdk.cache.level
+	);
+
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
+
+	const apiUrl = methods.NewfoldRuntime.createApiUrl(
+		'/newfold-performance/v1/cache/settings'
 	);
 
 	const cacheOptions = [
@@ -49,25 +56,31 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 	};
 
 	const getCacheLevelNoticeText = () => {
-		return cacheOptions[ cacheLevel ].notice;
+		return cacheOptions[ store.cacheLevel ].notice;
 	};
 
 	const handleCacheLevelChange = ( e ) => {
-		methods.newfoldSettingsApiFetch(
-			{ cacheLevel: parseInt( e.target.value ) },
-			methods.setError,
-			() => {
+
+		methods
+			.apiFetch( {
+				url: apiUrl,
+				method: 'POST',
+				data: { cacheLevel: parseInt( e.target.value ) },
+			} )
+			.then( () => {
 				setCacheLevel( parseInt( e.target.value ) );
-			}
-		);
+
+				setStore(prevState => ({
+					...prevState,
+					cacheLevel: parseInt( e.target.value ),
+				}))
+			} )
+			.catch( ( error ) => {
+				methods.setError
+			} );
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
-			cacheLevel,
-		} );
-
 		methods.makeNotice(
 			'cache-level-change-notice',
 			getCacheLevelNoticeTitle(),
@@ -95,7 +108,7 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 								<RadioGroup.Radio
 									defaultChecked={
 										option.value ===
-										constants.store.cacheLevel
+										methods.NewfoldRuntime.sdk.cache.level
 									}
 									id={ 'cache-level-' + option.value }
 									label={ option.label }
diff --git a/components/clearCache/index.js b/components/clearCache/index.js
index 494a3fc8..569b2a67 100644
--- a/components/clearCache/index.js
+++ b/components/clearCache/index.js
@@ -1,11 +1,22 @@
 import { Button, Container } from '@newfold/ui-component-library';
 
 const ClearCache = ( { methods, constants } ) => {
+
+	const apiUrl = methods.NewfoldRuntime.createApiUrl(
+		'/newfold-performance/v1/cache/settings'
+	);
+
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const clearCache = () => {
-		methods.newfoldPurgeCacheApiFetch(
-			{},
-			methods.setError,
-			( response ) => {
+
+
+		methods
+			.apiFetch( {
+				url: apiUrl,
+				method: 'DELETE',
+			} )
+			.then( () => {
 				methods.makeNotice(
 					'disable-old-posts-comments-notice',
 					constants.text.clearCacheNoticeTitle,
@@ -13,10 +24,15 @@ const ClearCache = ( { methods, constants } ) => {
 					'success',
 					5000
 				);
-			}
-		);
+			} )
+			.catch( ( error ) => {
+				methods.setError( error )
+			} );
 	};
 
+	const cacheLevel = store.cacheLevel ?? methods.NewfoldRuntime.sdk.cache.level;
+
+
 	return (
 		<Container.SettingsField
 			title={ constants.text.clearCacheTitle }
@@ -25,7 +41,7 @@ const ClearCache = ( { methods, constants } ) => {
 			<Button
 				variant="secondary"
 				className="clear-cache-button"
-				disabled={ constants.store.cacheLevel > 0 ? false : true }
+				disabled={ cacheLevel > 0 ? false : true }
 				onClick={ clearCache }
 			>
 				{ constants.text.clearCacheButton }
diff --git a/components/linkPrefetch/index.js b/components/linkPrefetch/index.js
index 0fc8a84d..241fd782 100644
--- a/components/linkPrefetch/index.js
+++ b/components/linkPrefetch/index.js
@@ -10,6 +10,8 @@ const LinkPrefetch = ( { methods, constants } ) => {
 	const [ settings, setSettings ] = methods.useState(
 		methods.NewfoldRuntime.sdk.linkPrefetch.settings
 	);
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const [ ignoreKeywords, setIgnoreKeywords ] = methods.useState(
 		settings.ignoreKeywords
 	);
@@ -45,10 +47,11 @@ const LinkPrefetch = ( { methods, constants } ) => {
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
+
+		setStore(prevState => ({
+			...prevState,
 			linkPrefetch: settings,
-		} );
+		}))
 
 		methods.makeNotice(
 			'link-prefetch-change-notice',
diff --git a/components/performance/index.js b/components/performance/index.js
index 30e842c4..ad2d4e87 100644
--- a/components/performance/index.js
+++ b/components/performance/index.js
@@ -18,8 +18,9 @@ import { default as LinkPrefetch } from '../linkPrefetch/';
  * @param {*} props
  * @return
  */
-const Performance = ( { methods, constants, Components, ...props } ) => {
+const Performance = ( { constants, methods, Components, ...props } ) => {
 	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const [ isError, setError ] = methods.useState( false );
 
 	const notify = methods.useNotification();
@@ -41,7 +42,7 @@ const Performance = ( { methods, constants, Components, ...props } ) => {
 			autoDismiss: duration,
 		} );
 	};
-	constants.store = store;
+
 	methods.makeNotice = makeNotice;
 	methods.setStore = setStore;
 	methods.setError = setError;
diff --git a/components/skip404/index.js b/components/skip404/index.js
index cdd1e70f..db8101f9 100644
--- a/components/skip404/index.js
+++ b/components/skip404/index.js
@@ -7,7 +7,7 @@ import { NewfoldRuntime } from '@newfold/wp-module-runtime';
 
 const Skip404 = ( { methods, constants } ) => {
 	const [ skip404, setSkip404 ] = methods.useState(
-		NewfoldRuntime.sdk.performance.skip404
+		NewfoldRuntime.sdk.skip404.is_active
 	);
 
 	const getSkip404NoticeTitle = () => {
@@ -17,7 +17,7 @@ const Skip404 = ( { methods, constants } ) => {
 	const handleSkip404Change = () => {
 		const value = ! skip404;
 		apiFetch( {
-			path: 'newfold-performance/v1/settings',
+			path: 'newfold-performance/v1/skip404',
 			method: 'POST',
 			data: {
 				field: {
diff --git a/composer.json b/composer.json
index 4234ce50..a444151b 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
 	  "newfold-labs/wp-module-installer": "^1.4.3"
 	},
 	"require-dev": {
-	  "newfold-labs/wp-php-standards": "^1.2.5",
+	  "newfold-labs/wp-php-standards": "^1.2.4",
 	  "wp-cli/wp-cli-bundle": "^2.11",
 	  "wp-cli/i18n-command": "^2.6",
 	  "10up/wp_mock": "^1.1"
diff --git a/composer.lock b/composer.lock
index 11bd2f4c..7de5ac67 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2405,16 +2405,16 @@
         },
         {
             "name": "newfold-labs/wp-php-standards",
-            "version": "1.2.5",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/newfold-labs/wp-php-standards.git",
-                "reference": "f895273a11b3f53dc29719fb859629e13291bf37"
+                "reference": "7ef8833b93f8bcdf52c6006f3adb53972d0799a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/newfold-labs/wp-php-standards/zipball/f895273a11b3f53dc29719fb859629e13291bf37",
-                "reference": "f895273a11b3f53dc29719fb859629e13291bf37",
+                "url": "https://api.github.com/repos/newfold-labs/wp-php-standards/zipball/7ef8833b93f8bcdf52c6006f3adb53972d0799a6",
+                "reference": "7ef8833b93f8bcdf52c6006f3adb53972d0799a6",
                 "shasum": ""
             },
             "require": {
@@ -2424,11 +2424,6 @@
                 "wp-coding-standards/wpcs": "@stable"
             },
             "type": "phpcodesniffer-standard",
-            "autoload": {
-                "psr-4": {
-                    "Newfold\\Sniffs\\": "Newfold/Sniffs/"
-                }
-            },
             "license": [
                 "GPL-2.0-or-later"
             ],
@@ -2440,10 +2435,10 @@
             ],
             "description": "PHP Code Sniffer Standards for Newfold WordPress projects.",
             "support": {
-                "source": "https://github.com/newfold-labs/wp-php-standards/tree/1.2.5",
+                "source": "https://github.com/newfold-labs/wp-php-standards/tree/1.2.4",
                 "issues": "https://github.com/newfold-labs/wp-php-standards/issues"
             },
-            "time": "2025-03-19T23:24:54+00:00"
+            "time": "2024-07-22T23:16:21+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4727,16 +4722,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.12.0",
+            "version": "3.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630"
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
-                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
                 "shasum": ""
             },
             "require": {
@@ -4803,11 +4798,11 @@
                     "type": "open_collective"
                 },
                 {
-                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "url": "https://thanks.dev/phpcsstandards",
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-03-18T05:04:51+00:00"
+            "time": "2025-01-23T17:04:15+00:00"
         },
         {
             "name": "symfony/console",
diff --git a/includes/BurstSafetyMode/Browser.php b/includes/BurstSafetyMode/Browser.php
index ecf1c1f5..e42c2dd3 100644
--- a/includes/BurstSafetyMode/Browser.php
+++ b/includes/BurstSafetyMode/Browser.php
@@ -1,7 +1,6 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
 
-use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\ResponseHeaderManager;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 
 /**
@@ -20,7 +19,7 @@ class Browser {
 	 */
 	public function __construct() {
 		$responseHeaderManager = new ResponseHeaderManager();
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', BURST_SAFETY_CACHE_LEVEL );
+		$responseHeaderManager->add_header( 'X-Newfold-Cache-Level', BURST_SAFETY_CACHE_LEVEL );
 		$this->addRules();
 	}
 
diff --git a/includes/BurstSafetyMode/ResponseHeaderManager.php b/includes/BurstSafetyMode/ResponseHeaderManager.php
index 1ca05095..be07ba46 100644
--- a/includes/BurstSafetyMode/ResponseHeaderManager.php
+++ b/includes/BurstSafetyMode/ResponseHeaderManager.php
@@ -36,7 +36,7 @@ public function __construct() {
 	 *
 	 * @return array
 	 */
-	public function parseHeaders() {
+	public function parse_headers() {
 
 		$headers = array();
 
@@ -63,10 +63,10 @@ public function parseHeaders() {
 	 * @param string $name  Header name
 	 * @param string $value Header value
 	 */
-	public function addHeader( string $name, string $value ) {
-		$this->setHeaders(
+	public function add_header( string $name, string $value ) {
+		$this->set_headers(
 			array_merge(
-				$this->parseHeaders(),
+				$this->parse_headers(),
 				array( $name => $value )
 			)
 		);
@@ -77,9 +77,9 @@ public function addHeader( string $name, string $value ) {
 	 *
 	 * @param string[] $headers Headers to add.
 	 */
-	public function addHeaders( array $headers ) {
-		$headers = array_merge( $this->parseHeaders(), $headers );
-		$this->setHeaders( $headers );
+	public function add_headers( array $headers ) {
+		$headers = array_merge( $this->parse_headers(), $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
@@ -87,17 +87,17 @@ public function addHeaders( array $headers ) {
 	 *
 	 * @param string $name Header name
 	 */
-	public function removeHeader( $name ) {
-		$headers = $this->parseHeaders();
+	public function remove_header( $name ) {
+		$headers = $this->parse_headers();
 		unset( $headers[ $name ] );
-		$this->setHeaders( $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
 	 * Remove all headers.
 	 */
-	public function removeAllHeaders() {
-		$this->setHeaders( array() );
+	public function remove_all_headers() {
+		$this->set_headers( array() );
 	}
 
 	/**
@@ -105,10 +105,10 @@ public function removeAllHeaders() {
 	 *
 	 * @param array $headers Headers to set.
 	 */
-	public function setHeaders( array $headers ) {
+	public function set_headers( array $headers ) {
 
 		if ( empty( $headers ) ) {
-			$this->htaccess->removeContent();
+			$this->htaccess->remove_content();
 
 			return;
 		}
diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index 2447e2e1..f95b0a6e 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -2,33 +2,24 @@
 
 use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Skip404 as BurstSkip404;
 use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Browser as BurstBrowser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser as CacheBrowser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404 as CacheSkip404;
-use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
-
+use NewfoldLabs\WP\Module\Performance\Cache\Types\Browser as CacheBrowser;
+use NewfoldLabs\WP\Module\Performance\Cache\ResponseHeaderManager;
 
 $newfold_burst_safety_mode = function_exists( 'get_option' ) ? (bool) get_option( 'newfold_burst_safety_mode', false ) : false;
 $newfold_cache_level       = function_exists( 'newfold_cache_level' ) ? (int) get_option( 'newfold_cache_level', 0 ) : 0;
 
 // Check if Performance feature is enabled and it's necessary reset the cache options
-if ( class_exists( 'NewfoldLabs\WP\Module\Performance\PerformanceFeatureHooks' ) ) {
+if ( class_exists( 'NewfoldLabs\WP\Module\Performance\Performance' ) ) {
 	if ( $newfold_burst_safety_mode ) {
 		$browser = new CacheBrowser();
 		$browser::maybeAddRules( $newfold_cache_level );
 
-		$skip_404_handling = (bool) get_option( 'newfold_skip_404_handling', true );
-
-		if ( ! $skip_404_handling ) {
-			$skip404 = new CacheSkip404();
-			$skip404::maybeAddRules( false );
-		}
-
 		$response_header_manager = new ResponseHeaderManager();
-		$response_header_manager->addHeader( 'X-Newfold-Cache-Level', $newfold_cache_level );
+		$response_header_manager->add_header( 'X-Newfold-Cache-Level', $newfold_cache_level );
 
 		delete_option( 'newfold_burst_safety_mode' );
 	}
-} elseif ( ! $newfold_burst_safety_mode ) {
+} elseif ( ! $newfold_burst_safety_mode && defined( 'BLUEHOST_PLUGIN_DIR' ) ) {
 		$files_to_include = array(
 			'htaccess'                => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/htaccess.php',
 			'htaccess_functions'      => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/functions.php',
diff --git a/includes/Cache/Cache.php b/includes/Cache/Cache.php
new file mode 100644
index 00000000..5d058cc9
--- /dev/null
+++ b/includes/Cache/Cache.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\Cache;
+
+use NewfoldLabs\WP\ModuleLoader\Container;
+
+use function NewfoldLabs\WP\Module\Performance\get_cache_exclusion;
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
+
+/**
+ * Cache manager.
+ */
+class Cache {
+
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var Container
+	 */
+	protected $container;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Container $container the container
+	 */
+	public function __construct( Container $container ) {
+		$this->container = $container;
+
+		$cacheManager = new CacheManager( $container );
+		$cachePurger  = new CachePurgingService( $cacheManager->get_instances() );
+
+		$container->set( 'cachePurger', $cachePurger );
+
+		new CacheExclusion( $container );
+
+		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
+
+		$this->hooks();
+
+		add_action( 'plugins_loaded', array( $this, 'hooks2' ) );
+
+		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ), 100 );
+	}
+
+	/**
+	 * Add hooks.
+	 */
+	public function hooks() {
+
+		add_action( 'after_mod_rewrite_rules', array( $this, 'on_rewrite' ) );
+
+		add_action( 'newfold_container_set', array( $this, 'plugin_hooks' ) );
+		add_action( 'plugins_loaded', array( $this, 'hooks' ) );
+
+		add_action( 'newfold_container_set', array( $this, 'plugin_hooks' ) );
+	}
+
+	/**
+	 * When updating mod rewrite rules, also update our rewrites as appropriate.
+	 */
+	public function on_rewrite() {
+		$this->on_cache_level_change( get_cache_level() );
+	}
+
+	/**
+	 * On cache level change, update the response headers.
+	 *
+	 * @param int|null $cacheLevel The cache level.
+	 */
+	public function on_cache_level_change( $cacheLevel ) {
+		/**
+		 * Respone Header Manager from container
+		 *
+		 * @var ResponseHeaderManager $responseHeaderManager
+		 */
+		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
+		$responseHeaderManager->add_header( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
+
+		// Remove the old option from EPC, if it exists.
+		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
+			update_option( 'endurance_cache_level', 0 );
+			delete_option( 'endurance_cache_level' );
+		}
+	}
+
+	/**
+	 * Add to Newfold SDK runtime.
+	 *
+	 * @param array $sdk SDK data.
+	 * @return array SDK data.
+	 */
+	public function add_to_runtime( $sdk ) {
+
+		$values = array(
+			'level'     => get_cache_level(),
+			'exclusion' => get_cache_exclusion(),
+		);
+
+		return array_merge( $sdk, array( 'cache' => $values ) );
+	}
+}
diff --git a/includes/CacheExclusion.php b/includes/Cache/CacheExclusion.php
similarity index 95%
rename from includes/CacheExclusion.php
rename to includes/Cache/CacheExclusion.php
index 39d89778..b5948738 100644
--- a/includes/CacheExclusion.php
+++ b/includes/Cache/CacheExclusion.php
@@ -1,5 +1,5 @@
 <?php
-namespace NewfoldLabs\WP\Module\Performance;
+namespace NewfoldLabs\WP\Module\Performance\Cache;
 
 use NewfoldLabs\WP\ModuleLoader\Container;
 
diff --git a/includes/Cache/CacheFeatureHooks.php b/includes/Cache/CacheFeatureHooks.php
new file mode 100644
index 00000000..aa9996b4
--- /dev/null
+++ b/includes/Cache/CacheFeatureHooks.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\Cache;
+
+use NewfoldLabs\WP\ModuleLoader\Container;
+use NewfoldLabs\WP\Module\Performance\OptionListener;
+use NewfoldLabs\WP\Module\Performance\Cache\Types\Browser;
+use NewfoldLabs\WP\Module\Performance\Cache\Types\File;
+
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
+
+/**
+ * Add activation/deactivation hooks for the performance feature.
+ **/
+class CacheFeatureHooks {
+
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var Container
+	 */
+	protected $container;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		if ( function_exists( 'add_action' ) ) {
+			add_action( 'newfold_container_set', array( $this, 'plugin_hooks' ) );
+			add_action( 'plugins_loaded', array( $this, 'hooks' ) );
+			new OptionListener( CacheManager::OPTION_CACHE_LEVEL, array( $this, 'on_cache_level_change' ) );
+		}
+	}
+
+	/**
+	 * Hooks for plugin activation/deactivation
+	 *
+	 * @param Container $container from the plugin
+	 */
+	public function plugin_hooks( Container $container ) {
+		$this->container = $container;
+		register_activation_hook( $container->plugin()->file, array( $this, 'on_activation' ) );
+		register_deactivation_hook( $container->plugin()->file, array( $this, 'on_deactivation' ) );
+	}
+
+	/**
+	 * Add hooks.
+	 */
+	public function hooks() {
+		add_action( 'newfold/features/action/onEnable:performance', array( $this, 'on_activation' ) );
+		add_action( 'newfold/features/action/onDisable:performance', array( $this, 'on_deactivation' ) );
+	}
+
+	/**
+	 * Activation hook to perform when plugin is activated or feature is enabled
+	 */
+	public function on_activation() {
+		File::on_activation();
+		Browser::on_activation();
+		// Add headers to .htaccess
+		$responseHeaderManager = new ResponseHeaderManager();
+		$responseHeaderManager->add_header( 'X-Newfold-Cache-Level', absint( get_cache_level() ) );
+	}
+
+	/**
+	 * Deactivation hook to perform when plugin is deactivated or feature is disabled
+	 */
+	public function on_deactivation() {
+		File::on_deactivation();
+		Browser::on_deactivation();
+		// Remove all headers from .htaccess
+		$responseHeaderManager = new ResponseHeaderManager();
+		$responseHeaderManager->remove_all_headers();
+	}
+
+	/**
+	 * On cache level change, update the response headers.
+	 *
+	 * @param int|null $cacheLevel The cache level.
+	 */
+	public function on_cache_level_change( $cacheLevel ) {
+		/**
+		 * Respone Header Manager from container
+		 *
+		 * @var ResponseHeaderManager $responseHeaderManager
+		 */
+		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
+		$responseHeaderManager->add_header( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
+
+		// Remove the old option from EPC, if it exists.
+		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
+			update_option( 'endurance_cache_level', 0 );
+			delete_option( 'endurance_cache_level' );
+		}
+	}
+}
diff --git a/includes/CacheManager.php b/includes/Cache/CacheManager.php
similarity index 52%
rename from includes/CacheManager.php
rename to includes/Cache/CacheManager.php
index a4e31a7c..f0f387db 100644
--- a/includes/CacheManager.php
+++ b/includes/Cache/CacheManager.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance;
+namespace NewfoldLabs\WP\Module\Performance\Cache;
 
-use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\File;
+use NewfoldLabs\WP\Module\Performance\Cache\Types\CacheBase;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
 
@@ -40,8 +39,6 @@ class CacheManager {
 	 */
 	public function __construct( Container $container ) {
 		$this->container = $container;
-
-		add_action( 'init', array( $this, 'remove_file_cache_htaccess_for_bh_hg' ) );
 	}
 
 	/**
@@ -51,12 +48,11 @@ public function __construct( Container $container ) {
 	 */
 	protected function classMap() {
 		return array(
-			'browser'    => __NAMESPACE__ . '\\CacheTypes\\Browser',
-			'cloudflare' => __NAMESPACE__ . '\\CacheTypes\\Cloudflare',
-			'file'       => __NAMESPACE__ . '\\CacheTypes\\File',
-			'nginx'      => __NAMESPACE__ . '\\CacheTypes\\Nginx',
-			'sitelock'   => __NAMESPACE__ . '\\CacheTypes\\Sitelock',
-			'skip404'    => __NAMESPACE__ . '\\CacheTypes\\Skip404',
+			'browser'    => __NAMESPACE__ . '\\Types\\Browser',
+			'cloudflare' => __NAMESPACE__ . '\\Types\\Cloudflare',
+			'file'       => __NAMESPACE__ . '\\Types\\File',
+			'nginx'      => __NAMESPACE__ . '\\Types\\Nginx',
+			'sitelock'   => __NAMESPACE__ . '\\Types\\Sitelock',
 		);
 	}
 
@@ -65,7 +61,7 @@ protected function classMap() {
 	 *
 	 * @return string[]
 	 */
-	public function registeredCacheTypes() {
+	public function registered_cache_types() {
 		return array_keys( $this->classMap() );
 	}
 
@@ -74,8 +70,8 @@ public function registeredCacheTypes() {
 	 *
 	 * @return array
 	 */
-	public function enabledCacheTypes() {
-		$default_cache_types = array( 'browser', 'skip404' );
+	public function enabled_cache_types() {
+		$default_cache_types = array( 'browser' );
 
 		if ( $this->container->has( 'cache_types' ) ) {
 			$provided_types = $this->container->get( 'cache_types' );
@@ -84,7 +80,7 @@ public function enabledCacheTypes() {
 		}
 
 		return is_array( $provided_types )
-		? array_intersect( array_map( 'strtolower', $provided_types ), $this->registeredCacheTypes() )
+		? array_intersect( array_map( 'strtolower', $provided_types ), $this->registered_cache_types() )
 		: $default_cache_types;
 	}
 
@@ -94,17 +90,17 @@ public function enabledCacheTypes() {
 	 *
 	 * @return CacheBase[] An array of cache type instances.
 	 */
-	public function getInstances() {
+	public function get_instances() {
 		$instances  = array();
 		$collection = new Collection( $this->classMap() );
-		$map        = $collection->only( $this->enabledCacheTypes() );
+		$map        = $collection->only( $this->enabled_cache_types() );
 		foreach ( $map as $type => $class ) {
 			/**
 			 * CacheBase instance.
 			 *
 			 * @var CacheBase $class
 			 */
-			if ( $class::shouldEnable( $this->container ) ) {
+			if ( $class::should_enable( $this->container ) ) {
 				$instances[ $type ] = new $class();
 				$instances[ $type ]->setContainer( $this->container );
 			}
@@ -112,26 +108,4 @@ public function getInstances() {
 
 		return $instances;
 	}
-
-	/**
-	 * Retrieves the cache level setting from the database.
-	 *
-	 * @return int The cache level value, ensuring an integer is returned.
-	 */
-	public static function get_cache_level() {
-		return (int) get_option( self::OPTION_CACHE_LEVEL, 0 );
-	}
-
-	/**
-	 * Remove the .htaccess rules for the file cache if the brand is Bluehost or HostGator.
-	 */
-	public function remove_file_cache_htaccess_for_bh_hg() {
-		$brand       = $this->container->plugin()->brand;
-		$fixed_bh_hg = get_option( 'nfd_file_cache_fixed_bh_hg', false );
-		if ( ( 'bluehost' === $brand || 'hostgator' !== $brand ) && ! $fixed_bh_hg ) {
-			File::removeRules();
-			update_option( 'nfd_file_cache_fixed_bh_hg', true );
-			return;
-		}
-	}
 }
diff --git a/includes/CachePurgingService.php b/includes/Cache/CachePurgingService.php
similarity index 65%
rename from includes/CachePurgingService.php
rename to includes/Cache/CachePurgingService.php
index 6d85f5c0..810865f2 100644
--- a/includes/CachePurgingService.php
+++ b/includes/Cache/CachePurgingService.php
@@ -1,43 +1,46 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance;
+namespace NewfoldLabs\WP\Module\Performance\Cache;
 
-use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
-use NewfoldLabs\WP\Module\Performance\Concerns\Purgeable;
+use NewfoldLabs\WP\Module\Performance\Performance;
+use NewfoldLabs\WP\Module\Performance\Cache\Types\CacheBase;
 use wpscholar\Url;
 
+use function NewfoldLabs\WP\Module\Performance\to_studly_case;
+use function NewfoldLabs\WP\Module\Performance\to_snake_case;
+
 /**
  * Cache purging service.
  */
 class CachePurgingService {
 
 	/**
-	 * Cache types.
+	 * Define cache types.
 	 *
-	 * @var CacheBase[] $cacheTypes Cache types.
+	 * @var array|CacheBase[] $cache_types Cache types.
 	 */
-	public $cacheTypes = array(); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.PropertyNotSnakeCase
+	public $cache_types = array();
 
 	/**
 	 * Constructor.
 	 *
-	 * @param CacheBase[] $cacheTypes Cache types.
+	 * @param CacheBase[] $cache_types Cache types.
 	 */
-	public function __construct( array $cacheTypes ) {
+	public function __construct( array $cache_types ) {
 
-		$this->cacheTypes = $cacheTypes; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$this->cache_types = $cache_types;
 
-		if ( $this->canPurge() ) {
+		if ( $this->can_purge() ) {
 
 			// Handle manual purge requests
-			add_action( 'init', array( $this, 'manualPurgeRequest' ) );
+			add_action( 'init', array( $this, 'manual_purge_request' ) );
 
 			// Handle automatic purging
-			add_action( 'transition_post_status', array( $this, 'onSavePost' ), 10, 3 );
-			add_action( 'edit_terms', array( $this, 'onEditTerm' ) );
-			add_action( 'comment_post', array( $this, 'onUpdateComment' ) );
-			add_action( 'updated_option', array( $this, 'onUpdateOption' ), 10, 3 );
-			add_action( 'wp_update_nav_menu', array( $this, 'purgeAll' ) );
+			add_action( 'transition_post_status', array( $this, 'on_save_post' ), 10, 3 );
+			add_action( 'edit_terms', array( $this, 'on_edit_term' ) );
+			add_action( 'comment_post', array( $this, 'on_update_comment' ) );
+			add_action( 'updated_option', array( $this, 'on_update_option' ), 10, 3 );
+			add_action( 'wp_update_nav_menu', array( $this, 'purge_all' ) );
 
 		}
 	}
@@ -47,8 +50,8 @@ public function __construct( array $cacheTypes ) {
 	 *
 	 * @return bool
 	 */
-	public function canPurge() {
-		foreach ( $this->cacheTypes as $instance ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+	public function can_purge() {
+		foreach ( $this->cache_types as $instance ) {
 			if ( array_key_exists( Purgeable::class, class_implements( $instance ) ) ) {
 				return true;
 			}
@@ -60,21 +63,21 @@ public function canPurge() {
 	/**
 	 * Listens for purge actions and handles based on type.
 	 */
-	public function manualPurgeRequest() {
+	public function manual_purge_request() {
 
-		$purgeAll = Performance::PURGE_ALL;
-		$purgeUrl = Performance::PURGE_URL;
+		$purge_all = Performance::PURGE_ALL;
+		$purge_url = Performance::PURGE_URL;
 
-		if ( ( isset( $_GET[ $purgeAll ] ) || isset( $_GET[ $purgeUrl ] ) ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+		if ( ( isset( $_GET[ $purge_all ] ) || isset( $_GET[ $purge_url ] ) ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 
 			$url = new Url();
-			$url->removeQueryVar( $purgeAll );
-			$url->removeQueryVar( $purgeUrl );
+			$url->removeQueryVar( $purge_all );
+			$url->removeQueryVar( $purge_url );
 
-			if ( isset( $_GET[ $purgeAll ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$this->purgeAll();
+			if ( isset( $_GET[ $purge_all ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+				$this->purge_all();
 			} else {
-				$this->purgeUrl( Url::stripQueryString( $url ) );
+				$this->purge_url( Url::stripQueryString( $url ) );
 			}
 			wp_safe_redirect(
 				$url,
@@ -88,15 +91,15 @@ public function manualPurgeRequest() {
 	/**
 	 * Purge everything.
 	 */
-	public function purgeAll() {
-		foreach ( $this->cacheTypes as $instance ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+	public function purge_all() {
+		foreach ( $this->cache_types as $instance ) {
 			if ( array_key_exists( Purgeable::class, class_implements( $instance ) ) ) {
 				/**
 				 * Purgeable instance.
 				 *
 				 * @var Purgeable $instance
 				 */
-				$instance->purgeAll();
+				$instance->purge_all();
 			}
 		}
 	}
@@ -106,15 +109,15 @@ public function purgeAll() {
 	 *
 	 * @param  string $url  The URL to be purged.
 	 */
-	public function purgeUrl( $url ) {
-		foreach ( $this->cacheTypes as $instance ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+	public function purge_url( $url ) {
+		foreach ( $this->cache_types as $instance ) {
 			if ( array_key_exists( Purgeable::class, class_implements( $instance ) ) ) {
 				/**
 				 * Purgeable instance.
 				 *
 				 * @var Purgeable $instance
 				 */
-				$instance->purgeUrl( $url );
+				$instance->purge_url( $url );
 			}
 		}
 	}
@@ -126,7 +129,7 @@ public function purgeUrl( $url ) {
 	 * @param  string   $newStatus  The new post status
 	 * @param  \WP_Post $post  The post object of the edited or created post
 	 */
-	public function onSavePost( $oldStatus, $newStatus, \WP_Post $post ) {
+	public function on_save_post( $oldStatus, $newStatus, \WP_Post $post ) {
 
 		// Skip purging for non-public post types
 		if ( ! get_post_type_object( $post->post_type )->public ) {
@@ -141,18 +144,18 @@ public function onSavePost( $oldStatus, $newStatus, \WP_Post $post ) {
 		// Purge post URL when post is updated.
 		$permalink = get_permalink( $post );
 		if ( $permalink ) {
-			$this->purgeUrl( $permalink );
+			$this->purge_url( $permalink );
 		}
 
 		// Purge taxonomy term URLs for related terms.
 		$taxonomies = get_post_taxonomies( $post );
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( $this->isPublicTaxonomy( $taxonomy ) ) {
+			if ( $this->is_public_taxonomy( $taxonomy ) ) {
 				$terms = get_the_terms( $post, $taxonomy );
 				if ( is_array( $terms ) ) {
 					foreach ( $terms as $term ) {
 						$term_link = get_term_link( $term );
-						$this->purgeUrl( $term_link );
+						$this->purge_url( $term_link );
 					}
 				}
 			}
@@ -161,12 +164,12 @@ public function onSavePost( $oldStatus, $newStatus, \WP_Post $post ) {
 		// Purge post type archive URL when post is updated.
 		$post_type_archive = get_post_type_archive_link( $post->post_type );
 		if ( $post_type_archive ) {
-			$this->purgeUrl( $post_type_archive );
+			$this->purge_url( $post_type_archive );
 		}
 
 		// Purge date archive URL when post is updated.
 		$year_archive = get_year_link( (int) get_the_date( 'y', $post ) );
-		$this->purgeUrl( $year_archive );
+		$this->purge_url( $year_archive );
 	}
 
 	/**
@@ -174,10 +177,10 @@ public function onSavePost( $oldStatus, $newStatus, \WP_Post $post ) {
 	 *
 	 * @param  int $termId  Term ID
 	 */
-	public function onEditTerm( $termId ) {
+	public function on_edit_term( $termId ) {
 		$url = get_term_link( $termId );
 		if ( ! is_wp_error( $url ) ) {
-			$this->purgeUrl( $url );
+			$this->purge_url( $url );
 		}
 	}
 
@@ -186,12 +189,12 @@ public function onEditTerm( $termId ) {
 	 *
 	 * @param  int $commentId  ID of the comment.
 	 */
-	public function onUpdateComment( $commentId ) {
+	public function on_update_comment( $commentId ) {
 		$comment = get_comment( $commentId );
 		if ( $comment && property_exists( $comment, 'comment_post_ID' ) ) {
 			$postUrl = get_permalink( $comment->comment_post_ID );
 			if ( $postUrl ) {
-				$this->purgeUrl( $postUrl );
+				$this->purge_url( $postUrl );
 			}
 		}
 	}
@@ -205,7 +208,7 @@ public function onUpdateComment( $commentId ) {
 	 *
 	 * @return bool
 	 */
-	public function onUpdateOption( $option, $oldValue, $newValue ) {
+	public function on_update_option( $option, $oldValue, $newValue ) {
 		// No need to process if nothing was updated
 		if ( $oldValue === $newValue ) {
 			return false;
@@ -292,7 +295,7 @@ public function onUpdateOption( $option, $oldValue, $newValue ) {
 		if ( ctype_upper( str_replace( array( '-', '_' ), '', $option ) ) ) {
 			$option = strtolower( $option );
 		}
-		$option_name = '_' . toSnakeCase( toStudlyCase( $option ) ) . '_';
+		$option_name = '_' . to_snake_case( to_studly_case( $option ) ) . '_';
 
 		foreach ( $forceIfContains as $slug ) {
 			if ( false !== strpos( $option_name, $slug ) ) {
@@ -309,7 +312,7 @@ public function onUpdateOption( $option, $oldValue, $newValue ) {
 			}
 		}
 
-		$this->purgeAll();
+		$this->purge_all();
 
 		return true;
 	}
@@ -321,7 +324,7 @@ public function onUpdateOption( $option, $oldValue, $newValue ) {
 	 *
 	 * @return boolean
 	 */
-	protected function isPublicTaxonomy( $taxonomy ) {
+	protected function is_public_taxonomy( $taxonomy ) {
 		$public          = false;
 		$taxonomy_object = get_taxonomy( $taxonomy );
 		if ( $taxonomy_object && isset( $taxonomy_object->public ) ) {
diff --git a/includes/Concerns/Purgeable.php b/includes/Cache/Purgeable.php
similarity index 71%
rename from includes/Concerns/Purgeable.php
rename to includes/Cache/Purgeable.php
index 8538d3c3..d7ee8f05 100644
--- a/includes/Concerns/Purgeable.php
+++ b/includes/Cache/Purgeable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\Concerns;
+namespace NewfoldLabs\WP\Module\Performance\Cache;
 
 /**
  * Interface for cache types that can be purged.
@@ -12,7 +12,7 @@ interface Purgeable {
 	 *
 	 * @return void
 	 */
-	public function purgeAll();
+	public function purge_all();
 
 	/**
 	 * Purge a specific URL for the given cache type.
@@ -21,5 +21,5 @@ public function purgeAll();
 	 *
 	 * @return void
 	 */
-	public function purgeUrl( $url );
+	public function purge_url( $url );
 }
diff --git a/includes/ResponseHeaderManager.php b/includes/Cache/ResponseHeaderManager.php
similarity index 75%
rename from includes/ResponseHeaderManager.php
rename to includes/Cache/ResponseHeaderManager.php
index 2e8f734f..bb9c19e1 100644
--- a/includes/ResponseHeaderManager.php
+++ b/includes/Cache/ResponseHeaderManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance;
+namespace NewfoldLabs\WP\Module\Performance\Cache;
 
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 
@@ -37,7 +37,7 @@ public function __construct() {
 	 *
 	 * @return array
 	 */
-	public function parseHeaders() {
+	public function parse_headers() {
 
 		$headers = array();
 
@@ -64,10 +64,10 @@ public function parseHeaders() {
 	 * @param string $name  Header name
 	 * @param string $value Header value
 	 */
-	public function addHeader( string $name, string $value ) {
-		$this->setHeaders(
+	public function add_header( string $name, string $value ) {
+		$this->set_headers(
 			array_merge(
-				$this->parseHeaders(),
+				$this->parse_headers(),
 				array( $name => $value )
 			)
 		);
@@ -78,9 +78,9 @@ public function addHeader( string $name, string $value ) {
 	 *
 	 * @param string[] $headers Headers to add.
 	 */
-	public function addHeaders( array $headers ) {
-		$headers = array_merge( $this->parseHeaders(), $headers );
-		$this->setHeaders( $headers );
+	public function add_headers( array $headers ) {
+		$headers = array_merge( $this->parse_headers(), $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
@@ -88,17 +88,17 @@ public function addHeaders( array $headers ) {
 	 *
 	 * @param string $name Header name
 	 */
-	public function removeHeader( $name ) {
-		$headers = $this->parseHeaders();
+	public function remove_header( $name ) {
+		$headers = $this->parse_headers();
 		unset( $headers[ $name ] );
-		$this->setHeaders( $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
 	 * Remove all headers.
 	 */
-	public function removeAllHeaders() {
-		$this->setHeaders( array() );
+	public function remove_all_headers() {
+		$this->set_headers( array() );
 	}
 
 	/**
@@ -106,7 +106,7 @@ public function removeAllHeaders() {
 	 *
 	 * @param array $headers Headers to set.
 	 */
-	public function setHeaders( array $headers ) {
+	public function set_headers( array $headers ) {
 
 		if ( empty( $headers ) ) {
 			$this->htaccess->removeContent();
diff --git a/includes/CacheTypes/Browser.php b/includes/Cache/Types/Browser.php
similarity index 88%
rename from includes/CacheTypes/Browser.php
rename to includes/Cache/Types/Browser.php
index 04cec0c5..2196bcfd 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/Cache/Types/Browser.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
 use NewfoldLabs\WP\Module\Performance\OptionListener;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
-use NewfoldLabs\WP\Module\Performance\CacheExclusion;
-use NewfoldLabs\WP\Module\Performance\CacheManager;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheExclusion;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheManager;
 
-use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
 /**
@@ -29,7 +29,7 @@ class Browser extends CacheBase {
 	 *
 	 * @return bool
 	 */
-	public static function shouldEnable( Container $container ) {
+	public static function should_enable( Container $container ) {
 		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
 	}
 
@@ -42,21 +42,21 @@ public function __construct() {
 
 		new OptionListener( CacheExclusion::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
-		add_filter( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
+		add_filter( 'newfold_update_htaccess', array( $this, 'on_rewrite' ) );
 	}
 
 	/**
 	 * When updating .htaccess, also update our rules as appropriate.
 	 */
-	public function onRewrite() {
-		self::maybeAddRules( getCacheLevel() );
+	public function on_rewrite() {
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
 	 * Manage on exlcusion option change.
 	 */
 	public static function exclusionChange() {
-		self::maybeAddRules( getCacheLevel() );
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
@@ -183,14 +183,14 @@ protected static function getFileTypeExpirations( int $cacheLevel ) {
 	/**
 	 * Handle activation logic.
 	 */
-	public static function onActivation() {
-		self::maybeAddRules( getCacheLevel() );
+	public static function on_activation() {
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
 	 * Handle deactivation logic.
 	 */
-	public static function onDeactivation() {
+	public static function on_deactivation() {
 		self::removeRules();
 	}
 }
diff --git a/includes/CacheTypes/CacheBase.php b/includes/Cache/Types/CacheBase.php
similarity index 81%
rename from includes/CacheTypes/CacheBase.php
rename to includes/Cache/Types/CacheBase.php
index 90c04c2c..f5632da6 100644
--- a/includes/CacheTypes/CacheBase.php
+++ b/includes/Cache/Types/CacheBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
 use NewfoldLabs\WP\ModuleLoader\Container;
 
@@ -23,7 +23,7 @@ abstract class CacheBase {
 	 *
 	 * @return bool True if the cache type should be enabled, false otherwise.
 	 */
-	public static function shouldEnable( Container $container ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
+	public static function should_enable( Container $container ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
 		return true;
 	}
 
diff --git a/includes/CacheTypes/Cloudflare.php b/includes/Cache/Types/Cloudflare.php
similarity index 90%
rename from includes/CacheTypes/Cloudflare.php
rename to includes/Cache/Types/Cloudflare.php
index 3cf62d66..36ca5de6 100644
--- a/includes/CacheTypes/Cloudflare.php
+++ b/includes/Cache/Types/Cloudflare.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
-use NewfoldLabs\WP\Module\Performance\Concerns\Purgeable;
+use NewfoldLabs\WP\Module\Performance\Cache\Purgeable;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
 /**
@@ -29,10 +29,10 @@ public function __construct( Container $container ) {
 	/**
 	 * Whether or not the code for this cache type should be loaded.
 	 *
-	 * @param Container $container Dependency injection container.
+	 * @param Container $container Method container.
 	 * @return bool True if the cache type should be enabled, false otherwise.
 	 */
-	public static function shouldEnable( Container $container ) {
+	public static function should_enable( Container $container ) {
 		return (bool) \get_option( 'endurance_cloudflare_enabled', false );
 	}
 
@@ -72,7 +72,7 @@ public function getCloudflareTier() {
 	/**
 	 * Purge all Cloudflare cache.
 	 */
-	public function purgeAll() {
+	public function purge_all() {
 		if ( $this->isCoudflareEnabled() ) {
 			$this->purgeRequest();
 		}
@@ -83,7 +83,7 @@ public function purgeAll() {
 	 *
 	 * @param string $url URL to purge.
 	 */
-	public function purgeUrl( $url ) {
+	public function purge_url( $url ) {
 		if ( $this->isCoudflareEnabled() ) {
 			$this->purgeRequest( array( $url ) );
 		}
diff --git a/includes/CacheTypes/File.php b/includes/Cache/Types/File.php
similarity index 83%
rename from includes/CacheTypes/File.php
rename to includes/Cache/Types/File.php
index 6bc2b38c..ca7ed7c5 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/Cache/Types/File.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
-use NewfoldLabs\WP\Module\Performance\Concerns\Purgeable;
+use NewfoldLabs\WP\Module\Performance\Cache\Purgeable;
 use NewfoldLabs\WP\Module\Performance\OptionListener;
 use NewfoldLabs\WP\ModuleLoader\Container;
-use NewfoldLabs\WP\Module\Performance\CacheExclusion;
-use NewfoldLabs\WP\Module\Performance\CacheManager;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheExclusion;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheManager;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 use wpscholar\Url;
 
-use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
-use function NewfoldLabs\WP\Module\Performance\removeDirectory;
-use function NewfoldLabs\WP\Module\Performance\shouldCachePages;
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
+use function NewfoldLabs\WP\Module\Performance\remove_directory;
+use function NewfoldLabs\WP\Module\Performance\should_cache_pages;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 use function NewfoldLabs\WP\ModuleLoader\container as getContainer;
 
@@ -41,7 +41,7 @@ class File extends CacheBase implements Purgeable {
 	 *
 	 * @return bool
 	 */
-	public static function shouldEnable( Container $container ) {
+	public static function should_enable( Container $container ) {
 		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
 	}
 
@@ -49,26 +49,25 @@ public static function shouldEnable( Container $container ) {
 	 * Constructor.
 	 */
 	public function __construct() {
-
 		new OptionListener( CacheManager::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
 		new OptionListener( CacheExclusion::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
 		add_action( 'init', array( $this, 'maybeGeneratePageCache' ) );
-		add_action( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
+		add_action( 'newfold_update_htaccess', array( $this, 'on_rewrite' ) );
 	}
 
 	/**
 	 * Manage on exlcusion option change.
 	 */
 	public static function exclusionChange() {
-		self::maybeAddRules( getCacheLevel() );
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
-	public function onRewrite() {
-		self::maybeAddRules( getCacheLevel() );
+	public function on_rewrite() {
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
@@ -146,10 +145,19 @@ public function write( $content ) {
 				$content .= "\n<!--Generated by Newfold Page Cache-->";
 			}
 
-			if ( ! is_dir( $path ) ) {
-				mkdir( $path, 0755, true );
+			global $wp_filesystem;
+
+			if ( ! function_exists( 'WP_Filesystem' ) ) {
+				require_once ABSPATH . 'wp-admin/includes/file.php';
+			}
+
+			WP_Filesystem();
+
+			if ( ! $wp_filesystem->is_dir( $path ) ) {
+				$wp_filesystem->mkdir( $path, 0755 );
 			}
-			file_put_contents( $file, $content, LOCK_EX ); // phpcs:ignore WordPress.WP.AlternativeFunctions
+
+			$wp_filesystem->put_contents( $file, $content, FS_CHMOD_FILE );
 
 		}
 
@@ -227,7 +235,7 @@ public function isCacheable() {
 	public function shouldCache() {
 
 		// If page caching is disabled, then don't cache
-		if ( ! shouldCachePages() ) {
+		if ( ! should_cache_pages() ) {
 			return false;
 		}
 
@@ -268,7 +276,7 @@ protected function exclusions() {
 	 * @return int
 	 */
 	protected function getExpirationTimeframe() {
-		switch ( getCacheLevel() ) {
+		switch ( get_cache_level() ) {
 			case 2:
 				return 2 * HOUR_IN_SECONDS;
 			case 3:
@@ -281,8 +289,8 @@ protected function getExpirationTimeframe() {
 	/**
 	 * Purge everything from the cache.
 	 */
-	public function purgeAll() {
-		removeDirectory( self::CACHE_DIR );
+	public function purge_all() {
+		remove_directory( self::CACHE_DIR );
 	}
 
 	/**
@@ -290,18 +298,18 @@ public function purgeAll() {
 	 *
 	 * @param string $url the url to purge.
 	 */
-	public function purgeUrl( $url ) {
+	public function purge_url( $url ) {
 		$path = $this->getStoragePathForRequest();
 
 		if ( trailingslashit( self::CACHE_DIR ) === $path ) {
 			if ( file_exists( self::CACHE_DIR . '/_index.html' ) ) {
-				unlink( self::CACHE_DIR . '/_index.html' );
+				wp_delete_file( self::CACHE_DIR . '/_index.html' );
 			}
 
 			return;
 		}
 
-		removeDirectory( $this->getStoragePathForRequest() );
+		remove_directory( $this->getStoragePathForRequest() );
 	}
 
 	/**
@@ -333,19 +341,19 @@ protected function getStorageFileForRequest() {
 	/**
 	 * Handle activation logic.
 	 */
-	public static function onActivation() {
-		self::maybeAddRules( getCacheLevel() );
+	public static function on_activation() {
+		self::maybeAddRules( get_cache_level() );
 	}
 
 	/**
 	 * Handle deactivation logic.
 	 */
-	public static function onDeactivation() {
+	public static function on_deactivation() {
 
 		// Remove file cache rules from .htaccess
 		self::removeRules();
 
 		// Remove all statically cached files
-		removeDirectory( self::CACHE_DIR );
+		remove_directory( self::CACHE_DIR );
 	}
 }
diff --git a/includes/CacheTypes/Nginx.php b/includes/Cache/Types/Nginx.php
similarity index 89%
rename from includes/CacheTypes/Nginx.php
rename to includes/Cache/Types/Nginx.php
index ec3daf53..9ec297bb 100644
--- a/includes/CacheTypes/Nginx.php
+++ b/includes/Cache/Types/Nginx.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
-use NewfoldLabs\WP\Module\Performance\Concerns\Purgeable;
+use NewfoldLabs\WP\Module\Performance\Cache\Purgeable;
 use wpscholar\Url;
 
 /**
@@ -13,7 +13,7 @@ class Nginx extends CacheBase implements Purgeable {
 	/**
 	 * Purge all assets from the Nginx cache.
 	 */
-	public function purgeAll() {
+	public function purge_all() {
 		$this->purgeRequest();
 	}
 
@@ -22,7 +22,7 @@ public function purgeAll() {
 	 *
 	 * @param string $url The URL to purge.
 	 */
-	public function purgeUrl( $url ) {
+	public function purge_url( $url ) {
 		$this->purgeRequest( $url );
 	}
 
diff --git a/includes/CacheTypes/Sitelock.php b/includes/Cache/Types/Sitelock.php
similarity index 89%
rename from includes/CacheTypes/Sitelock.php
rename to includes/Cache/Types/Sitelock.php
index fc2a68a4..6fa1894d 100644
--- a/includes/CacheTypes/Sitelock.php
+++ b/includes/Cache/Types/Sitelock.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types;
 
-use NewfoldLabs\WP\Module\Performance\Concerns\Purgeable;
+use NewfoldLabs\WP\Module\Performance\Cache\Purgeable;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
 /**
@@ -17,14 +17,14 @@ class Sitelock extends CacheBase implements Purgeable {
 	 *
 	 * @return bool True if the code should be loaded, false otherwise.
 	 */
-	public static function shouldEnable( Container $container ) {
+	public static function should_enable( Container $container ) {
 		return (bool) \get_option( 'endurance_sitelock_enabled', false );
 	}
 
 	/**
 	 * Purge all content from the Sitelock CDN cache.
 	 */
-	public function purgeAll() {
+	public function purge_all() {
 
 		$refresh_token = \get_option( '_mm_refresh_token' );
 
@@ -65,7 +65,7 @@ public function purgeAll() {
 	 *
 	 * @param string $url The URL to purge.
 	 */
-	public function purgeUrl( $url ) {
+	public function purge_url( $url ) {
 
 		$refreshToken = \get_option( '_mm_refresh_token' );
 
diff --git a/includes/CacheTypes/WPCLI/CacheTypesCommandHandler.php b/includes/Cache/Types/WPCLI/CacheTypesCommandHandler.php
similarity index 92%
rename from includes/CacheTypes/WPCLI/CacheTypesCommandHandler.php
rename to includes/Cache/Types/WPCLI/CacheTypesCommandHandler.php
index bddf316d..7afc22c3 100644
--- a/includes/CacheTypes/WPCLI/CacheTypesCommandHandler.php
+++ b/includes/Cache/Types/WPCLI/CacheTypesCommandHandler.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes\WPCLI;
+namespace NewfoldLabs\WP\Module\Performance\Cache\Types\WPCLI;
 
-use NewfoldLabs\WP\Module\Performance\CacheExclusion;
-use NewfoldLabs\WP\Module\Performance\CacheManager;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheExclusion;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheManager;
 use NewfoldLabs\WP\Module\Performance\NFD_WPCLI;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
+use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;
 
 /**
  * Handles WP-CLI commands for Cache settings.
@@ -91,7 +91,7 @@ public function skip_404( $args ) {
 			NFD_WPCLI::error( __( "Invalid value. Use 'true' or 'false' for skip_404 handling.", 'wp-module-performance' ) );
 		}
 		$status = filter_var( $args[0], FILTER_VALIDATE_BOOLEAN );
-		update_option( Skip404::OPTION_SKIP_404, $status );
+		update_option( Skip404::OPTION_NAME, $status );
 		NFD_WPCLI::success(
 			sprintf(
 				/* translators: %s is the new boolean status. */
diff --git a/includes/CacheTypes/Skip404.php b/includes/CacheTypes/Skip404.php
deleted file mode 100644
index 8c7a3154..00000000
--- a/includes/CacheTypes/Skip404.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace NewfoldLabs\WP\Module\Performance\CacheTypes;
-
-use NewfoldLabs\WP\Module\Performance\OptionListener;
-use NewfoldLabs\WP\ModuleLoader\Container;
-
-use function NewfoldLabs\WP\Module\Performance\getSkip404Option;
-use function WP_Forge\WP_Htaccess_Manager\addContent;
-use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
-
-/**
- * Skip 404 cache type.
- */
-class Skip404 extends CacheBase {
-
-	/**
-	 * The file marker name.
-	 */
-	const MARKER = 'Newfold Skip 404 Handling for Static Files';
-
-	/**
-	 * The option name.
-	 */
-	public const OPTION_SKIP_404 = 'newfold_skip_404_handling';
-
-	/**
-	 * Whether or not the code for this cache type should be loaded.
-	 *
-	 * @param Container $container Dependency injection container.
-	 *
-	 * @return bool
-	 */
-	public static function shouldEnable( Container $container ) {
-		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-
-		new OptionListener( self::OPTION_SKIP_404, array( __CLASS__, 'maybeAddRules' ) );
-
-		add_filter( 'newfold_update_htaccess', array( $this, 'onUpdateHtaccess' ) );
-	}
-
-	/**
-	 * When updating .htaccess, also update our rules as appropriate.
-	 */
-	public function onUpdateHtaccess() {
-		self::maybeAddRules( getSkip404Option() );
-
-		// Remove the old option from EPC, if it exists
-		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'epc_skip_404_handling', 0 ) ) ) {
-			update_option( 'epc_skip_404_handling', 0 );
-			delete_option( 'epc_skip_404_handling' );
-		}
-	}
-
-	/**
-	 * Conditionally add or remove .htaccess rules based on option value.
-	 *
-	 * @param bool|null $shouldSkip404Handling if should skip 404 handling.
-	 */
-	public static function maybeAddRules( $shouldSkip404Handling ) {
-		(bool) $shouldSkip404Handling ? self::addRules() : self::removeRules();
-	}
-
-	/**
-	 * Add our rules to the .htacces file.
-	 */
-	public static function addRules() {
-		$content = <<<HTACCESS
-<IfModule mod_rewrite.c>
-	RewriteEngine On
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteCond %{REQUEST_URI} !(robots\.txt|ads\.txt|[a-z0-9_\-]*sitemap[a-z0-9_\.\-]*\.(xml|xsl|html)(\.gz)?)
-	RewriteCond %{REQUEST_URI} \.(css|htc|less|js|js2|js3|js4|html|htm|rtf|rtx|txt|xsd|xsl|xml|asf|asx|wax|wmv|wmx|avi|avif|avifs|bmp|class|divx|doc|docx|eot|exe|gif|gz|gzip|ico|jpg|jpeg|jpe|webp|json|mdb|mid|midi|mov|qt|mp3|m4a|mp4|m4v|mpeg|mpg|mpe|webm|mpp|otf|_otf|odb|odc|odf|odg|odp|ods|odt|ogg|ogv|pdf|png|pot|pps|ppt|pptx|ra|ram|svg|svgz|swf|tar|tif|tiff|ttf|ttc|_ttf|wav|wma|wri|woff|woff2|xla|xls|xlsx|xlt|xlw|zip)$ [NC]
-	RewriteRule .* - [L]
-</IfModule>
-HTACCESS;
-
-		addContent( self::MARKER, $content );
-	}
-
-	/**
-	 * Remove our rules from the .htaccess file.
-	 */
-	public static function removeRules() {
-		removeMarkers( self::MARKER );
-	}
-
-	/**
-	 * Handle activation logic.
-	 */
-	public static function onActivation() {
-		self::maybeAddRules( getSkip404Option() );
-	}
-
-	/**
-	 * Handle deactivation logic.
-	 */
-	public static function onDeactivation() {
-		self::removeRules();
-	}
-}
diff --git a/includes/HealthChecks/HealthCheck.php b/includes/HealthChecks/HealthCheck.php
index 7b5667d3..b345ed16 100644
--- a/includes/HealthChecks/HealthCheck.php
+++ b/includes/HealthChecks/HealthCheck.php
@@ -95,7 +95,8 @@ public function register_health_check( $tests ) {
 					'actions'     => $this->actions,
 					'test'        => $this->id,
 					'badge'       => array(
-						'label' => __( 'Performance' ), // No text domain, as we want to match the WP core badge text.
+						// No text domain, as we want to match the WP core badge text.
+						'label' => __( 'Performance' ), // phpcs:ignore WordPress.WP.I18n.MissingArgDomain
 						'color' => $this->badge_color,
 					),
 				);
diff --git a/includes/JetpackBoost/JetpackBoost.php b/includes/JetpackBoost/JetpackBoost.php
index 487a772b..96c415e4 100644
--- a/includes/JetpackBoost/JetpackBoost.php
+++ b/includes/JetpackBoost/JetpackBoost.php
@@ -33,9 +33,6 @@ public function __construct( Container $container ) {
 
 		// Set default values for JetPack Boost on fresh installation.
 		add_action( 'admin_init', array( $this, 'handle_jetpack_boost_default_values' ) );
-
-		// Activate Jetpack Boost on fresh installatin.
-		add_action( 'activated_plugin', array( $this, 'activate_jetpack_boost' ) );
 	}
 
 	/**
@@ -84,8 +81,10 @@ public function is_jetpackpremium_active() {
 	 * @return void
 	 */
 	public function prefetch_jetpack_boost() {
-		$admin_url = admin_url( 'admin.php?page=jetpack-boost' );
-		echo '<link rel="prefetch" href="' . esc_url( $admin_url ) . '">' . "\n";
+		if ( is_plugin_active( 'jetpack-boost/jetpack-boost.php' ) ) {
+			$admin_url = admin_url( 'admin.php?page=jetpack-boost' );
+			echo '<link rel="prefetch" href="' . esc_url( $admin_url ) . '">' . "\n";
+		}
 	}
 
 	/**
@@ -98,22 +97,4 @@ public function handle_jetpack_boost_default_values() {
 			update_option( 'jetpack_boost_status_render-blocking-js', true );
 		}
 	}
-
-
-	/**
-	 * Activate Jetpack Boost automatically on fresh installation
-	 *
-	 * @param string $plugin Plugin just activated.
-	 * @return void
-	 */
-	public function activate_jetpack_boost( $plugin ) {
-		if ( $this->container->plugin()->basename === $plugin &&
-			$this->container->has( 'isFreshInstallation' ) &&
-			$this->container->get( 'isFreshInstallation' ) &&
-			isset( $_REQUEST['action'] ) && // phpcs:ignore WordPress.Security.NonceVerification
-			'activate' === $_REQUEST['action'] // phpcs:ignore WordPress.Security.NonceVerification
-			) {
-			PluginInstaller::install( 'jetpack-boost', true );
-		}
-	}
 }
diff --git a/includes/Performance.php b/includes/Performance.php
index 8ebe779b..a2a5059e 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -2,18 +2,21 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+use Automattic\Jetpack\Current_Plan;
+
 use NewfoldLabs\WP\ModuleLoader\Container;
 use NewfoldLabs\WP\Module\Installer\Services\PluginInstaller;
-use NewfoldLabs\WP\Module\Performance\Permissions;
 use NewfoldLabs\WP\Module\Performance\Images\ImageManager;
 use NewfoldLabs\WP\Module\Performance\RestApi\RestApi;
 use NewfoldLabs\WP\Module\Performance\Data\Constants;
-use NewfoldLabs\WP\Module\Performance\HealthChecks;
 use NewfoldLabs\WP\Module\Performance\Services\I18nService;
 use NewfoldLabs\WP\Module\Performance\LinkPrefetch\LinkPrefetch;
+use NewfoldLabs\WP\Module\Performance\Cache\Cache;
+use NewfoldLabs\WP\Module\Performance\Cache\ResponseHeaderManager;
+use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;
 use NewfoldLabs\WP\Module\Performance\JetpackBoost\JetpackBoost;
 
-use function NewfoldLabs\WP\Module\Performance\is_settings_page;
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
 
 /**
  * Main class for the performance module.
@@ -34,16 +37,6 @@ class Performance {
 	 */
 	const PURGE_URL = 'nfd_purge_url';
 
-	/**
-	 * The HTML ID of the section in the settings where performance options can be managed.
-	 */
-	const SETTINGS_ID = 'newfold-performance-settings';
-
-	/**
-	 * The name of the performance settings section.
-	 */
-	const SETTINGS_SECTION = 'newfold_performance_settings_section';
-
 	/**
 	 * Dependency injection container.
 	 *
@@ -61,36 +54,29 @@ public function __construct( Container $container ) {
 		$this->container = $container;
 		$this->configureContainer( $container );
 
-		$this->hooks( $container );
+		$this->hooks();
 
-		$cacheManager = new CacheManager( $container );
-		$cachePurger  = new CachePurgingService( $cacheManager->getInstances() );
+		new Cache( $container );
+		new Skip404( $container );
 		new PerformanceWPCLI();
 		new Constants( $container );
 		new ImageManager( $container );
 		new HealthChecks( $container );
 
 		new LinkPrefetch( $container );
-		new CacheExclusion( $container );
 
 		new JetpackBoost( $container );
 
-		add_action( 'admin_bar_menu', array( $this, 'adminBarMenu' ), 100 );
+		add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 );
 		add_action( 'admin_menu', array( $this, 'add_sub_menu_page' ) );
 		add_filter( 'nfd_plugin_subnav', array( $this, 'add_nfd_subnav' ) );
 
-		$container->set( 'cachePurger', $cachePurger );
-
-		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
-
 		if ( Permissions::is_authorized_admin() || Permissions::rest_is_authorized_admin() ) {
 			new RestAPI();
 		}
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
 
-		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ), 100 );
-
 		! defined( 'NFD_PERFORMANCE_PLUGIN_LANGUAGES_DIR' ) && define( 'NFD_PERFORMANCE_PLUGIN_LANGUAGES_DIR', dirname( $container->plugin()->file ) . '/vendor/newfold-labs/wp-module-performance/languages' );
 		new I18nService( $container );
 	}
@@ -136,8 +122,6 @@ public function hooks() {
 
 		add_action( 'admin_init', array( $this, 'remove_epc_settings' ), 99 );
 
-		new OptionListener( CacheManager::OPTION_CACHE_LEVEL, array( $this, 'onCacheLevelChange' ) );
-
 		/**
 		 * On CLI requests, mod_rewrite is unavailable, so it fails to update
 		 * the .htaccess file when save_mod_rewrite_rules() is called. This
@@ -161,7 +145,6 @@ function () {
 			}
 		);
 
-		add_action( 'after_mod_rewrite_rules', array( $this, 'onRewrite' ) );
 		add_filter( 'action_scheduler_retention_period', array( $this, 'nfd_asr_default' ) );
 		add_filter( 'action_scheduler_cleanup_batch_size', array( $this, 'nfd_as_cleanup_batch_size' ) );
 	}
@@ -219,40 +202,12 @@ public function nfd_as_cleanup_batch_size( $batch_size ) {
 		return 1000;
 	}
 
-	/**
-	 * When updating mod rewrite rules, also update our rewrites as appropriate.
-	 */
-	public function onRewrite() {
-		$this->onCacheLevelChange( getCacheLevel() );
-	}
-
-	/**
-	 * On cache level change, update the response headers.
-	 *
-	 * @param int|null $cacheLevel The cache level.
-	 */
-	public function onCacheLevelChange( $cacheLevel ) {
-		/**
-		 * Respone Header Manager from container
-		 *
-		 * @var ResponseHeaderManager $responseHeaderManager
-		 */
-		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
-
-		// Remove the old option from EPC, if it exists.
-		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
-			update_option( 'endurance_cache_level', 0 );
-			delete_option( 'endurance_cache_level' );
-		}
-	}
-
 	/**
 	 * Add options to the WordPress admin bar.
 	 *
 	 * @param \WP_Admin_Bar $wp_admin_bar the admin bar.
 	 */
-	public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
+	public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {
 
 		// If the EPC MU plugin exists, remove its cache clearing options.
 		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
@@ -267,7 +222,7 @@ public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 				)
 			);
 
-			$cache_level = CacheManager::get_cache_level();
+			$cache_level = get_cache_level();
 			if ( $cache_level > 0 ) {
 				$wp_admin_bar->add_node(
 					array(
@@ -344,18 +299,4 @@ public function enqueue_styles() {
 			wp_enqueue_style( 'wp-module-performance-styles' );
 		}
 	}
-
-	/**
-	 * Add to Newfold SDK runtime.
-	 *
-	 * @param array $sdk SDK data.
-	 * @return array SDK data.
-	 */
-	public function add_to_runtime( $sdk ) {
-		$values = array(
-			'skip404' => getSkip404Option(),
-		);
-
-		return array_merge( $sdk, array( 'performance' => $values ) );
-	}
 }
diff --git a/includes/PerformanceFeature.php b/includes/PerformanceFeature.php
index 7f238578..3d27a951 100644
--- a/includes/PerformanceFeature.php
+++ b/includes/PerformanceFeature.php
@@ -2,8 +2,6 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
-use NewfoldLabs\WP\Module\Performance\Performance;
-
 use function NewfoldLabs\WP\ModuleLoader\container as getContainer;
 
 /**
diff --git a/includes/PerformanceFeatureHooks.php b/includes/PerformanceFeatureHooks.php
deleted file mode 100644
index 0b6ef42a..00000000
--- a/includes/PerformanceFeatureHooks.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace NewfoldLabs\WP\Module\Performance;
-
-use NewfoldLabs\WP\ModuleLoader\Container;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\File;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
-use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
-
-use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
-
-/**
- * Add activation/deactivation hooks for the performance feature.
- **/
-class PerformanceFeatureHooks {
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		if ( function_exists( 'add_action' ) ) {
-			add_action( 'newfold_container_set', array( $this, 'pluginHooks' ) );
-			add_action( 'plugins_loaded', array( $this, 'hooks' ) );
-		}
-	}
-
-	/**
-	 * Hooks for plugin activation/deactivation
-	 *
-	 * @param Container $container from the plugin
-	 */
-	public function pluginHooks( Container $container ) {
-		register_activation_hook( $container->plugin()->file, array( $this, 'onActivation' ) );
-		register_deactivation_hook( $container->plugin()->file, array( $this, 'onDeactivation' ) );
-	}
-
-	/**
-	 * Add hooks.
-	 */
-	public function hooks() {
-		add_action( 'newfold/features/action/onEnable:performance', array( $this, 'onActivation' ) );
-		add_action( 'newfold/features/action/onDisable:performance', array( $this, 'onDeactivation' ) );
-	}
-
-	/**
-	 * Activation hook to perform when plugin is activated or feature is enabled
-	 */
-	public function onActivation() {
-		Skip404::onActivation();
-		File::onActivation();
-		Browser::onActivation();
-		// Add headers to .htaccess
-		$responseHeaderManager = new ResponseHeaderManager();
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( getCacheLevel() ) );
-	}
-
-	/**
-	 * Deactivation hook to perform when plugin is deactivated or feature is disabled
-	 */
-	public function onDeactivation() {
-		Skip404::onDeactivation();
-		File::onDeactivation();
-		Browser::onDeactivation();
-		// Remove all headers from .htaccess
-		$responseHeaderManager = new ResponseHeaderManager();
-		$responseHeaderManager->removeAllHeaders();
-	}
-}
diff --git a/includes/PerformanceWPCLI.php b/includes/PerformanceWPCLI.php
index c0bac56d..402e4d00 100644
--- a/includes/PerformanceWPCLI.php
+++ b/includes/PerformanceWPCLI.php
@@ -4,7 +4,7 @@
 
 use NewfoldLabs\WP\Module\Performance\Images\WPCLI\ImageCommandHandler;
 use NewfoldLabs\WP\Module\Performance\LinkPrefetch\WPCLI\LinkPrefetchCommandHandler;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\WPCLI\CacheTypesCommandHandler;
+use NewfoldLabs\WP\Module\Performance\Cache\Types\WPCLI\CacheTypesCommandHandler;
 
 /**
  * Manages all "wp nfd performance" WP-CLI commands.
diff --git a/includes/RestApi/CacheController.php b/includes/RestApi/CacheController.php
new file mode 100644
index 00000000..76bdd46a
--- /dev/null
+++ b/includes/RestApi/CacheController.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\RestApi;
+
+use NewfoldLabs\WP\Module\ECommerce\Permissions;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheExclusion;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheManager;
+use NewfoldLabs\WP\Module\Performance\Cache\CachePurgingService;
+
+use function NewfoldLabs\WP\ModuleLoader\container;
+use function NewfoldLabs\WP\Module\Performance\get_cache_level;
+use function NewfoldLabs\WP\Module\Performance\get_cache_exclusion;
+
+/**
+ * Class CacheExclusionController
+ */
+class CacheController {
+	/**
+	 * REST namespace
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'newfold-performance/v1';
+
+	/**
+	 * REST base
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '/cache';
+
+	/**
+	 * Registers rest routes for PluginsController class.
+	 *
+	 * @return void
+	 */
+	public function register_routes() {
+
+		\register_rest_route(
+			$this->namespace,
+			$this->rest_base . '/settings',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_settings' ),
+					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
+				),
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'update_settings' ),
+					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
+				),
+				array(
+					'methods'             => \WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'purge_all' ),
+					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
+				),
+			)
+		);
+	}
+
+	/**
+	 * Get the settings
+	 *
+	 * @return \WP_REST_Response
+	 */
+	public function get_settings() {
+		return new \WP_REST_Response(
+			array(
+				'cacheExclusion' => get_cache_exclusion(),
+				'cacheLevel'     => get_cache_level(),
+			),
+			200
+		);
+	}
+
+	/**
+	 * Update the settings
+	 *
+	 * @param \WP_REST_Request $request the request.
+	 * @return \WP_REST_Response
+	 */
+	public function update_settings( \WP_REST_Request $request ) {
+
+		if ( $request->has_param( 'cacheExclusion' ) ) {
+			$cache_exclusion = $request->get_param( 'cacheExclusion' );
+			$result          = update_option( CacheExclusion::OPTION_CACHE_EXCLUSION, $cache_exclusion );
+		} elseif ( $request->has_param( 'cacheLevel' ) ) {
+			$cache_level = $request->get_param( 'cacheLevel' );
+			$result      = update_option( CacheManager::OPTION_CACHE_LEVEL, $cache_level );
+		}
+
+		if ( $result ) {
+			return new \WP_REST_Response(
+				array(
+					'result' => true,
+				),
+				200
+			);
+		} else {
+			return new \WP_REST_Response(
+				array(
+					'result' => false,
+				),
+				400
+			);
+		}
+	}
+
+	/**
+	 * Clears the entire cache
+	 */
+	public function purge_all() {
+
+		container()->get( 'cachePurger' )->purge_all();
+
+		return array(
+			'status'  => 'success',
+			'message' => 'Cache purged',
+		);
+	}
+}
diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
deleted file mode 100644
index ce056f40..00000000
--- a/includes/RestApi/CacheExclusionController.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace NewfoldLabs\WP\Module\Performance\RestApi;
-
-use NewfoldLabs\WP\Module\ECommerce\Permissions;
-use NewfoldLabs\WP\Module\Performance\CacheExclusion;
-
-use function NewfoldLabs\WP\Module\Performance\get_default_cache_exclusions;
-
-/**
- * Class CacheExclusionController
- */
-class CacheExclusionController {
-	/**
-	 * REST namespace
-	 *
-	 * @var string
-	 */
-	protected $namespace = 'newfold-performance/v1';
-
-	/**
-	 * REST base
-	 *
-	 * @var string
-	 */
-	protected $rest_base = '/cache-exclusion';
-
-	/**
-	 * Registers rest routes for PluginsController class.
-	 *
-	 * @return void
-	 */
-	public function register_routes() {
-		\register_rest_route(
-			$this->namespace,
-			$this->rest_base . '/settings',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_settings' ),
-					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
-				),
-			)
-		);
-		\register_rest_route(
-			$this->namespace,
-			$this->rest_base . '/update',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::CREATABLE,
-					'callback'            => array( $this, 'update_settings' ),
-					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
-				),
-			)
-		);
-	}
-
-	/**
-	 * Get the settings
-	 *
-	 * @return \WP_REST_Response
-	 */
-	public function get_settings() {
-		return new \WP_REST_Response(
-			array(
-				'cacheExclusion' => get_option( CacheExclusion::OPTION_CACHE_EXCLUSION, get_default_cache_exclusions() ),
-			),
-			200
-		);
-	}
-
-	/**
-	 * Update the settings
-	 *
-	 * @param \WP_REST_Request $request the request.
-	 * @return \WP_REST_Response
-	 */
-	public function update_settings( \WP_REST_Request $request ) {
-		$cache_exclusion = $request->get_param( 'cacheExclusion' );
-		if ( update_option( CacheExclusion::OPTION_CACHE_EXCLUSION, $cache_exclusion ) ) {
-			return new \WP_REST_Response(
-				array(
-					'result' => true,
-				),
-				200
-			);
-		}
-
-		return new \WP_REST_Response(
-			array(
-				'result' => false,
-			),
-			400
-		);
-	}
-}
diff --git a/includes/RestApi/RestApi.php b/includes/RestApi/RestApi.php
index 8eaeb703..c1f8b911 100644
--- a/includes/RestApi/RestApi.php
+++ b/includes/RestApi/RestApi.php
@@ -12,10 +12,10 @@ final class RestApi {
 	 * @var array
 	 */
 	protected $controllers = array(
-		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\SettingsController',
+		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\Skip404Controller',
 		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\LinkPrefetchController',
 		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\JetpackController',
-		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\CacheExclusionController',
+		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\CacheController',
 	);
 
 	/**
diff --git a/includes/RestApi/SettingsController.php b/includes/RestApi/Skip404Controller.php
similarity index 92%
rename from includes/RestApi/SettingsController.php
rename to includes/RestApi/Skip404Controller.php
index 75a91f49..372b2be8 100644
--- a/includes/RestApi/SettingsController.php
+++ b/includes/RestApi/Skip404Controller.php
@@ -1,14 +1,14 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance\RestApi;
 
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
+use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;
 
 /**
  * Class Settings
  *
  * @package NewfoldLabs\WP\Module\Performance
  */
-class SettingsController {
+class Skip404Controller {
 
 	/**
 	 * The REST route namespace.
@@ -22,7 +22,7 @@ class SettingsController {
 	 *
 	 * @var string
 	 */
-	protected $rest_base = '/settings';
+	protected $rest_base = '/skip404';
 
 	/**
 	 * Register API routes.
@@ -79,7 +79,7 @@ public function set_options( $request ) {
 
 			switch ( $field['id'] ) {
 				case 'skip404':
-					$result = update_option( Skip404::OPTION_SKIP_404, $field['value'] );
+					$result = update_option( Skip404::OPTION_NAME, $field['value'] );
 					break;
 
 				default:
diff --git a/includes/Skip404/Skip404.php b/includes/Skip404/Skip404.php
new file mode 100644
index 00000000..3c36bfa7
--- /dev/null
+++ b/includes/Skip404/Skip404.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\Skip404;
+
+use NewfoldLabs\WP\ModuleLoader\Container;
+use NewfoldLabs\WP\Module\Performance\OptionListener;
+
+use function WP_Forge\WP_Htaccess_Manager\addContent;
+use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
+
+/**
+ * Handles Skip 404 functionality.
+ */
+class Skip404 {
+
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var Container
+	 */
+	protected $container;
+
+	/**
+	 * Option name for skip 404 setting.
+	 *
+	 * @var string
+	 */
+	const OPTION_NAME = 'newfold_skip_404_handling';
+
+	/**
+	 * The file marker name.
+	 */
+	const MARKER = 'Newfold Skip 404 Handling for Static Files';
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Container $container The dependency injection container.
+	 */
+	public function __construct( Container $container ) {
+		$this->container = $container;
+
+		new OptionListener( self::OPTION_NAME, array( __CLASS__, 'maybe_add_rules' ) );
+
+		add_filter( 'newfold_update_htaccess', array( $this, 'on_update_htaccess' ) );
+
+		add_action( 'newfold_container_set', array( $this, 'handle_actions_newfold_container_set' ) );
+		add_action( 'plugins_loaded', array( $this, 'handle_actions_on_plugins_loaded' ) );
+
+		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ), 100 );
+
+		register_activation_hook( $container->plugin()->file, array( $this, 'on_activation' ) );
+		register_deactivation_hook( $container->plugin()->file, array( $this, 'on_deactivation' ) );
+	}
+
+
+	/**
+	 * Perform actions on enabling/disabling Performance feature
+	 *
+	 * @return void
+	 */
+	public function handle_actions_on_plugins_loaded() {
+		add_action( 'newfold/features/action/onEnable:performance', array( $this, 'on_activation' ) );
+		add_action( 'newfold/features/action/onDisable:performance', array( $this, 'on_deactivation' ) );
+	}
+
+	/**
+	 * Detect if the feature needs to be performed or not
+	 *
+	 * @param Container $container Dependency injection container.
+	 *
+	 * @return bool
+	 */
+	public static function is_active( Container $container ) {
+		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
+	}
+
+	/**
+	 * Get value for SKIP404 option
+	 *
+	 * @return bool
+	 */
+	public static function get_value() {
+		return (bool) get_option( self::OPTION_NAME, true );
+	}
+
+	/**
+	 * When updating .htaccess, also update our rules as appropriate.
+	 */
+	public function on_update_htaccess() {
+		self::maybe_add_rules( self::get_value() );
+
+		// Remove the old option from EPC, if it exists
+		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'epc_skip_404_handling', 0 ) ) ) {
+			update_option( 'epc_skip_404_handling', 0 );
+			delete_option( 'epc_skip_404_handling' );
+		}
+	}
+
+	/**
+	 * Conditionally add or remove .htaccess rules based on option value.
+	 *
+	 * @param bool|null $shouldSkip404Handling if should skip 404 handling.
+	 */
+	public static function maybe_add_rules( $shouldSkip404Handling ) {
+		(bool) $shouldSkip404Handling ? self::add_rules() : self::remove_rules();
+	}
+
+	/**
+	 * Add our rules to the .htacces file.
+	 */
+	public static function add_rules() {
+		$content = <<<HTACCESS
+            <IfModule mod_rewrite.c>
+                RewriteEngine On
+                RewriteCond %{REQUEST_FILENAME} !-f
+                RewriteCond %{REQUEST_FILENAME} !-d
+                RewriteCond %{REQUEST_URI} !(robots\.txt|ads\.txt|[a-z0-9_\-]*sitemap[a-z0-9_\.\-]*\.(xml|xsl|html)(\.gz)?)
+                RewriteCond %{REQUEST_URI} \.(css|htc|less|js|js2|js3|js4|html|htm|rtf|rtx|txt|xsd|xsl|xml|asf|asx|wax|wmv|wmx|avi|avif|avifs|bmp|class|divx|doc|docx|eot|exe|gif|gz|gzip|ico|jpg|jpeg|jpe|webp|json|mdb|mid|midi|mov|qt|mp3|m4a|mp4|m4v|mpeg|mpg|mpe|webm|mpp|otf|_otf|odb|odc|odf|odg|odp|ods|odt|ogg|ogv|pdf|png|pot|pps|ppt|pptx|ra|ram|svg|svgz|swf|tar|tif|tiff|ttf|ttc|_ttf|wav|wma|wri|woff|woff2|xla|xls|xlsx|xlt|xlw|zip)$ [NC]
+                RewriteRule .* - [L]
+            </IfModule>
+            HTACCESS; // phpcs:ignore Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsedHeredocCloser
+
+		addContent( self::MARKER, $content );
+	}
+
+	/**
+	 * Remove our rules from the .htaccess file.
+	 */
+	public static function remove_rules() {
+		removeMarkers( self::MARKER );
+	}
+
+	/**
+	 * Handle activation logic.
+	 */
+	public static function on_activation() {
+		self::maybe_add_rules( self::get_value() );
+	}
+
+	/**
+	 * Handle deactivation logic.
+	 */
+	public static function on_deactivation() {
+		self::remove_rules();
+	}
+
+	/**
+	 * Add to Newfold SDK runtime.
+	 *
+	 * @param array $sdk SDK data.
+	 * @return array SDK data.
+	 */
+	public function add_to_runtime( $sdk ) {
+		$values = array(
+			'is_active' => $this->get_value(),
+		);
+
+		return array_merge( $sdk, array( 'skip404' => $values ) );
+	}
+}
diff --git a/includes/burstSafetyModeFunctions.php b/includes/burstSafetyModeFunctions.php
deleted file mode 100644
index 983e7ede..00000000
--- a/includes/burstSafetyModeFunctions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace NewfoldLabs\WP\Module\Performance;
-
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
-use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
-
-$newfold_burst_safety_mode = (bool) get_option( 'newfold_burst_safety_mode' );
-
-$site_cache_level = get_option( 'newfold_cache_level', 3 );
-$site_skip404     = (bool) get_option( 'newfold_skip_404_handling', true );
-
-if ( defined( 'BURST_SAFETY_MODE' ) && BURST_SAFETY_MODE ) {
-	if ( false === $newfold_burst_safety_mode ) {
-		$current_level = get_option( CacheManager::OPTION_CACHE_LEVEL );
-		update_option( 'newfold_burst_safety_mode', true );
-		update_option( 'newfold_burst_safety_mode_site_cache_level', $current_level );
-		$browser = new Browser();
-		$browser::maybeAddRules( 3 );
-		if ( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
-			$skip404 = new Skip404();
-			$skip404::maybeAddRules( true );
-		}
-		$response_header_manager = new ResponseHeaderManager();
-		$response_header_manager->addHeader( 'X-Newfold-Cache-Level', 3 );
-	}
-} elseif ( $newfold_burst_safety_mode ) {
-	$cache_level = get_option( 'newfold_burst_safety_mode_site_cache_level' );
-	$browser     = new Browser();
-	$browser::maybeAddRules( $cache_level );
-	if ( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
-		$skip404 = new Skip404();
-		$skip404::maybeAddRules( false );
-	}
-	$response_header_manager = new ResponseHeaderManager();
-	$response_header_manager->addHeader( 'X-Newfold-Cache-Level', $cache_level );
-	delete_option( 'newfold_burst_safety_mode' );
-	delete_option( 'newfold_burst_safety_mode_site_cache_level' );
-}
diff --git a/includes/functions.php b/includes/functions.php
index a03cbac9..25ead451 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -2,7 +2,9 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
+use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheManager;
+use NewfoldLabs\WP\Module\Performance\Cache\CacheExclusion;
 
 /**
  * Return defaul exclusions.
@@ -18,43 +20,17 @@ function get_default_cache_exclusions() {
  *
  * @return int Cache level.
  */
-function getCacheLevel() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function get_cache_level() {
 	return absint( get_option( CacheManager::OPTION_CACHE_LEVEL, 2 ) );
 }
 
 /**
- * Get available cache levels.
+ * Get the cache exclusion.
  *
- * @return string[] Cache levels.
+ * @return int Cache exclusion.
  */
-function getCacheLevels() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	return array(
-		0 => 'Off',         // Disable caching.
-		1 => 'Assets Only', // Cache assets only.
-		2 => 'Normal',      // Cache pages and assets for a shorter time range.
-		3 => 'Advanced',    // Cache pages and assets for a longer time range.
-	);
-}
-
-/**
- * Output the cache level select field.
- */
-function getCacheLevelDropdown() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-
-	$cacheLevels       = getCacheLevels();
-	$currentCacheLevel = getCacheLevel();
-
-	$name  = CacheManager::OPTION_CACHE_LEVEL;
-	$label = __( 'Cache Level', 'wp-module-performance' );
-	?>
-	<select name="<?php echo esc_attr( $name ); ?>" aria-label="<?php echo esc_attr( $label ); ?>">
-		<?php foreach ( $cacheLevels as $cacheLevel => $optionLabel ) : ?>
-			<option value="<?php echo absint( $cacheLevel ); ?>"<?php selected( $cacheLevel, $currentCacheLevel ); ?>>
-				<?php echo esc_html( $optionLabel ); ?>
-			</option>
-		<?php endforeach; ?>
-	</select>
-	<?php
+function get_cache_exclusion() {
+	return get_option( CacheExclusion::OPTION_CACHE_EXCLUSION, get_default_cache_exclusions() );
 }
 
 /**
@@ -62,26 +38,8 @@ function getCacheLevelDropdown() { // phpcs:ignore WordPress.NamingConventions.V
  *
  * @return bool Whether to skip 404 handling for static files.
  */
-function getSkip404Option() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	return (bool) get_option( Skip404::OPTION_SKIP_404, true );
-}
-
-/**
- * Output the "Skip WordPress 404 Handling for Static Files" input field.
- */
-function getSkip404InputField() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	$name  = Skip404::OPTION_SKIP_404;
-	$value = getSkip404Option();
-	$label = __( 'Skip WordPress 404 Handling For Static Files', 'wp-module-performance' );
-	?>
-	<input
-		type="checkbox"
-		name="<?php echo esc_attr( $name ); ?>"
-		value="1"
-		aria-label="<?php echo esc_attr( $label ); ?>"
-		<?php checked( $value, true ); ?>
-	/>
-	<?php
+function get_skip404_option() {
+	return (bool) get_option( Skip404::OPTION_NAME, true );
 }
 
 /**
@@ -89,8 +47,8 @@ function getSkip404InputField() { // phpcs:ignore WordPress.NamingConventions.Va
  *
  * @return bool
  */
-function shouldCachePages() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	return getCacheLevel() > 1;
+function should_cache_pages() {
+	return get_cache_level() > 1;
 }
 
 /**
@@ -98,8 +56,8 @@ function shouldCachePages() { // phpcs:ignore WordPress.NamingConventions.ValidF
  *
  * @return bool
  */
-function shouldCacheAssets() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	return getCacheLevel() > 0;
+function should_cache_assets() {
+	return get_cache_level() > 0;
 }
 
 /**
@@ -107,15 +65,30 @@ function shouldCacheAssets() { // phpcs:ignore WordPress.NamingConventions.Valid
  *
  * @param string $path Path to the directory.
  */
-function removeDirectory( $path ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	if ( ! is_dir( $path ) ) {
+function remove_directory( $path ) {
+	global $wp_filesystem;
+
+	if ( ! function_exists( 'WP_Filesystem' ) ) {
+		require_once ABSPATH . 'wp-admin/includes/file.php';
+	}
+	WP_Filesystem();
+
+	if ( ! $wp_filesystem || ! $wp_filesystem->is_dir( $path ) ) {
 		return;
 	}
-	$files = glob( $path . '/*' );
-	foreach ( $files as $file ) {
-		is_dir( $file ) ? removeDirectory( $file ) : wp_delete_file( $file );
+
+	$files = $wp_filesystem->dirlist( $path );
+
+	foreach ( $files as $file => $file_info ) {
+		$file_path = trailingslashit( $path ) . $file;
+		if ( 'f' === $file_info['type'] ) {
+			$wp_filesystem->delete( $file_path );
+		} elseif ( 'd' === $file_info['type'] ) {
+			remove_directory( $file_path );
+		}
 	}
-	rmdir( $path );
+
+	$wp_filesystem->rmdir( $path );
 }
 
 /**
@@ -126,7 +99,7 @@ function removeDirectory( $path ) { // phpcs:ignore WordPress.NamingConventions.
  *
  * @return string
  */
-function toSnakeCase( string $value, string $delimiter = '_' ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function to_snake_case( string $value, string $delimiter = '_' ) {
 	if ( ! ctype_lower( $value ) ) {
 		$value = preg_replace( '/(\s+)/u', '', ucwords( $value ) );
 		$value = trim( mb_strtolower( preg_replace( '/([A-Z][A-Z0-9]*(?=$|[A-Z][a-z0-9])|[A-Za-z][a-z0-9]+)/u', '$1' . $delimiter, $value ), 'UTF-8' ), $delimiter );
@@ -142,7 +115,7 @@ function toSnakeCase( string $value, string $delimiter = '_' ) { // phpcs:ignore
  *
  * @return string
  */
-function toStudlyCase( $value ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function to_studly_case( $value ) {
 	return str_replace( ' ', '', ucwords( str_replace( array( '-', '_' ), ' ', $value ) ) );
 }