diff --git a/Classes/CrashReports/BITCrashManager.h b/Classes/CrashReports/BITCrashManager.h
index 777bc71150..1f4d955f21 100644
--- a/Classes/CrashReports/BITCrashManager.h
+++ b/Classes/CrashReports/BITCrashManager.h
@@ -30,7 +30,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "BITHockeyBaseManager.h"
+#import "../Helper/BITHockeyBaseManager.h"
 
 
 // hockey crash manager status
diff --git a/Classes/Feedback/BITFeedbackComposeViewController.h b/Classes/Feedback/BITFeedbackComposeViewController.h
index 078a26aa49..217db38baf 100644
--- a/Classes/Feedback/BITFeedbackComposeViewController.h
+++ b/Classes/Feedback/BITFeedbackComposeViewController.h
@@ -28,7 +28,6 @@
 
 
 #import <UIKit/UIKit.h>
-#import "BITHockeyBaseViewController.h"
 
 @interface BITFeedbackComposeViewController : UIViewController <UITextViewDelegate>
 
diff --git a/Classes/Feedback/BITFeedbackListViewController.h b/Classes/Feedback/BITFeedbackListViewController.h
index 9ed216bd21..a63addd734 100644
--- a/Classes/Feedback/BITFeedbackListViewController.h
+++ b/Classes/Feedback/BITFeedbackListViewController.h
@@ -29,7 +29,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "BITHockeyBaseViewController.h"
+#import "../Helper/BITHockeyBaseViewController.h"
 
 
 @interface BITFeedbackListViewController : BITHockeyBaseViewController <UITableViewDelegate, UITableViewDataSource> {
diff --git a/Classes/Feedback/BITFeedbackManager.h b/Classes/Feedback/BITFeedbackManager.h
index fed6ee873a..adfe8d3e2e 100644
--- a/Classes/Feedback/BITFeedbackManager.h
+++ b/Classes/Feedback/BITFeedbackManager.h
@@ -29,7 +29,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "BITHockeyBaseManager.h"
+#import "../Helper/BITHockeyBaseManager.h"
 #import "BITFeedbackListViewController.h"
 #import "BITFeedbackComposeViewController.h"
 
diff --git a/Classes/HockeySDK.h b/Classes/HockeySDK.h
index 2503fcdf27..5215fdbbe5 100644
--- a/Classes/HockeySDK.h
+++ b/Classes/HockeySDK.h
@@ -33,18 +33,18 @@
 #import "BITHockeyManager.h"
 #import "BITHockeyManagerDelegate.h"
 
-#import "BITHockeyBaseManager.h"
+#import "Helper/BITHockeyBaseManager.h"
 
-#import "BITCrashManager.h"
-#import "BITCrashManagerDelegate.h"
+#import "CrashReports/BITCrashManager.h"
+#import "CrashReports/BITCrashManagerDelegate.h"
 
-#import "BITUpdateManager.h"
-#import "BITUpdateManagerDelegate.h"
-#import "BITUpdateViewController.h"
+#import "Update/BITUpdateManager.h"
+#import "Update/BITUpdateManagerDelegate.h"
+#import "Update/BITUpdateViewController.h"
 
-#import "BITFeedbackManager.h"
-#import "BITFeedbackComposeViewController.h"
-#import "BITFeedbackListViewController.h"
+#import "Feedback/BITFeedbackManager.h"
+#import "Feedback/BITFeedbackComposeViewController.h"
+#import "Feedback/BITFeedbackListViewController.h"
 
 
 // Notification message which HockeyManager is listening to, to retry requesting updated from the server
diff --git a/Classes/Update/BITUpdateManager.h b/Classes/Update/BITUpdateManager.h
index 656f8d07db..7355569d24 100644
--- a/Classes/Update/BITUpdateManager.h
+++ b/Classes/Update/BITUpdateManager.h
@@ -30,7 +30,7 @@
 
 
 #import <UIKit/UIKit.h>
-#import "BITHockeyBaseManager.h"
+#import "../Helper/BITHockeyBaseManager.h"
 
 
 typedef enum {
diff --git a/Classes/Update/BITUpdateViewController.h b/Classes/Update/BITUpdateViewController.h
index cf131cc49b..4f03a0d182 100644
--- a/Classes/Update/BITUpdateViewController.h
+++ b/Classes/Update/BITUpdateViewController.h
@@ -30,7 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "BITHockeyBaseViewController.h"
+#import "../Helper/BITHockeyBaseViewController.h"
 
 
 @class PSStoreButton;