diff --git a/xcode/commonFastfile b/xcode/commonFastfile
index 07f75da..e36fee4 100644
--- a/xcode/commonFastfile
+++ b/xcode/commonFastfile
@@ -106,10 +106,10 @@ private_lane :addShield do |options|
   end
 end
 
-private_lane :generateFeaturesJSONFile do |options|
+private_lane :generateFeaturesFile do |options|
   app_target_folder_name = options[:appName] || $appName
 
-  project_features_file_path = File.expand_path "../#{app_target_folder_name}/Resources/Features.json"
+  project_features_file_path = File.expand_path "../#{app_target_folder_name}/Resources/Features/Features.json"
   build_settings_file_path = File.expand_path "../common/build_settings.yaml"
 
   builder_features_list = options[:features]
@@ -150,7 +150,7 @@ private_lane :buildConfiguration do |options|
   installDependencies(options)
 
   unless options[:features].nil?
-    uploadFeaturesToProject(options)
+    generateFeaturesFile(options)
   end
 
   if !(options[:uploadToFabric] || options[:uploadToAppStore])
diff --git a/xcode/fastlane/touchlane/lib/touchlane/configuration.rb b/xcode/fastlane/touchlane/lib/touchlane/configuration.rb
index 00b93a1..02cc4d3 100644
--- a/xcode/fastlane/touchlane/lib/touchlane/configuration.rb
+++ b/xcode/fastlane/touchlane/lib/touchlane/configuration.rb
@@ -1,7 +1,5 @@
 require "yaml"
 
-require_relative 'managers/managers'
-
 module Touchlane
   class Configuration
     def initialize(type, app_identifier, apple_id, team_id, itc_team_id)
diff --git a/xcode/fastlane/touchlane/lib/touchlane/features.rb b/xcode/fastlane/touchlane/lib/touchlane/features.rb
index 0173dc4..62d1b10 100644
--- a/xcode/fastlane/touchlane/lib/touchlane/features.rb
+++ b/xcode/fastlane/touchlane/lib/touchlane/features.rb
@@ -1,6 +1,6 @@
 require 'json'
 
-require_relative 'managers/managers'
+require_relative File.expand_path "../build-scripts/xcode/managers/managers"
 
 module Touchlane
   class Features