diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1369eee1..be0d0b6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,6 +446,10 @@ else(JVX_COMPILE_BUILDTOOLS)
     if(NOT EXISTS ${FLUTTER_SDK_PATH})
       message(FATAL_ERROR "The environment variable <FLUTTER_SDK_PATH> must be set if compiling Flutter support - it is <${FLUTTER_SDK_PATH}> but that folder seems to not exist.")
     endif()
+	
+	# Run install commands in flutter subfolder
+	add_subdirectory(./flutter)
+	
   endif()
 
   if(NOT ${JVX_OS} MATCHES "windows")
diff --git a/flutter/CMakeLists.txt b/flutter/CMakeLists.txt
new file mode 100644
index 00000000..e9d90eea
--- /dev/null
+++ b/flutter/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+if(JVX_RELEASE_SDK)
+	install(DIRECTORY ${JVX_BASE_ROOT}/flutter/project_templates DESTINATION ${INSTALL_PATH_RELEASE_ROOT}/flutter)
+endif()
+
+ 
diff --git a/flutter/project_templates/linux/common/ayf-sdk-local-headers.h b/flutter/project_templates/common/ayf-sdk-local-headers.h
similarity index 68%
rename from flutter/project_templates/linux/common/ayf-sdk-local-headers.h
rename to flutter/project_templates/common/ayf-sdk-local-headers.h
index d57fa824..08689d2c 100644
--- a/flutter/project_templates/linux/common/ayf-sdk-local-headers.h
+++ b/flutter/project_templates/common/ayf-sdk-local-headers.h
@@ -1,10 +1,13 @@
 #ifndef __AYF_SDK_LOCAL_HEADERS_H__
 #define __AYF_SDK_LOCAL_HEADERS_H__
 
+#define STRINGIZE_(a) #a
+#define STRINGIZE(a) STRINGIZE_(a)
+
 #define JVX_COMPONENT_ACCESS_CALLING_CONVENTION 
 #include "jvx_sdk.h"
 #include "jvx.h"
 #include "flutter_native_host_config.h"
-#include "ayfstarter-native-config.h"
+#include STRINGIZE(AYF_PROJECT.h)
 
 #endif
\ No newline at end of file