diff --git a/flow-typed/Notification.js b/flow-typed/Notification.js
index f0f63a1a9..28bce14f5 100644
--- a/flow-typed/Notification.js
+++ b/flow-typed/Notification.js
@@ -91,3 +91,46 @@ declare type NotificationState = {
   errors: Array<ErrorNotification>,
   toasts: Array<Toast>,
 };
+
+declare type WebNotification = {
+  active_at: string,
+  created_at: string,
+  id: number,
+  is_app_readable: boolean,
+  is_device_notified: boolean,
+  is_emailed: boolean,
+  is_read: boolean,
+  is_seen: boolean,
+  notification_parameters: {
+    device: {
+      analytics_label: string,
+      image_url: string,
+      is_data_only: boolean,
+      name: string,
+      placeholders: ?string,
+      target: string,
+      text: string,
+      title: string,
+      type: string,
+    },
+    dynamic: {
+      comment_author: string,
+      reply_author: string,
+      hash: string,
+      claim_title: string,
+      comment?: string,
+      channel_url: string,
+    },
+    email: {},
+  },
+  notification_rule: string,
+  type: string,
+  updated_at: string,
+  user_id: number,
+  group_count?: number,
+};
+
+declare type NotificationCategory = {
+  name: string,
+  types: ?Array<string>,
+};
diff --git a/flow-typed/Publish.js b/flow-typed/Publish.js
index 87955ae24..f237b12c9 100644
--- a/flow-typed/Publish.js
+++ b/flow-typed/Publish.js
@@ -11,17 +11,44 @@ declare type UpdatePublishFormData = {
   thumbnail_url?: string,
   uploadThumbnailStatus?: string,
   thumbnailPath?: string,
+  thumbnailError?: boolean,
   description?: string,
   language?: string,
   channel?: string,
   channelId?: string,
   name?: string,
   nameError?: string,
-  bid?: string,
+  bid?: number,
   bidError?: string,
   otherLicenseDescription?: string,
   licenseUrl?: string,
   licenseType?: string,
   uri?: string,
   nsfw: boolean,
+  isMarkdownPost?: boolean,
+};
+
+declare type PublishParams = {
+  name: ?string,
+  bid: ?number,
+  filePath?: string,
+  description: ?string,
+  language: string,
+  publishingLicense?: string,
+  publishingLicenseUrl?: string,
+  thumbnail: ?string,
+  channel: string,
+  channelId?: string,
+  title: string,
+  contentIsFree: boolean,
+  uri?: string,
+  license: ?string,
+  licenseUrl: ?string,
+  fee?: {
+    amount: string,
+    currency: string,
+  },
+  claim: StreamClaim,
+  nsfw: boolean,
+  tags: Array<Tag>,
 };
diff --git a/flow-typed/notification.js b/flow-typed/notification.js
deleted file mode 100644
index ea5a38c72..000000000
--- a/flow-typed/notification.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// @flow
-declare type WebNotification = {
-  active_at: string,
-  created_at: string,
-  id: number,
-  is_app_readable: boolean,
-  is_device_notified: boolean,
-  is_emailed: boolean,
-  is_read: boolean,
-  is_seen: boolean,
-  notification_parameters: {
-    device: {
-      analytics_label: string,
-      image_url: string,
-      is_data_only: boolean,
-      name: string,
-      placeholders: ?string,
-      target: string,
-      text: string,
-      title: string,
-      type: string,
-    },
-    dynamic: {
-      comment_author: string,
-      reply_author: string,
-      hash: string,
-      claim_title: string,
-      comment?: string,
-      channel_url: string,
-    },
-    email: {},
-  },
-  notification_rule: string,
-  type: string,
-  updated_at: string,
-  user_id: number,
-  group_count?: number,
-};
-
-declare type NotificationCategory = {
-  name: string,
-  types: ?Array<string>,
-};
diff --git a/flow-typed/publish.js b/flow-typed/publish.js
deleted file mode 100644
index f237b12c9..000000000
--- a/flow-typed/publish.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// @flow
-
-declare type UpdatePublishFormData = {
-  filePath?: string,
-  contentIsFree?: boolean,
-  fee?: {
-    amount: string,
-    currency: string,
-  },
-  title?: string,
-  thumbnail_url?: string,
-  uploadThumbnailStatus?: string,
-  thumbnailPath?: string,
-  thumbnailError?: boolean,
-  description?: string,
-  language?: string,
-  channel?: string,
-  channelId?: string,
-  name?: string,
-  nameError?: string,
-  bid?: number,
-  bidError?: string,
-  otherLicenseDescription?: string,
-  licenseUrl?: string,
-  licenseType?: string,
-  uri?: string,
-  nsfw: boolean,
-  isMarkdownPost?: boolean,
-};
-
-declare type PublishParams = {
-  name: ?string,
-  bid: ?number,
-  filePath?: string,
-  description: ?string,
-  language: string,
-  publishingLicense?: string,
-  publishingLicenseUrl?: string,
-  thumbnail: ?string,
-  channel: string,
-  channelId?: string,
-  title: string,
-  contentIsFree: boolean,
-  uri?: string,
-  license: ?string,
-  licenseUrl: ?string,
-  fee?: {
-    amount: string,
-    currency: string,
-  },
-  claim: StreamClaim,
-  nsfw: boolean,
-  tags: Array<Tag>,
-};
diff --git a/flow-typed/redux.js b/flow-typed/redux.js
deleted file mode 100644
index e159c168e..000000000
--- a/flow-typed/redux.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-declare type Dispatch = any;