diff --git a/app/client/src/pages/Editor/PropertyPane.tsx b/app/client/src/pages/Editor/PropertyPane.tsx
index 2467895364..0359daf284 100644
--- a/app/client/src/pages/Editor/PropertyPane.tsx
+++ b/app/client/src/pages/Editor/PropertyPane.tsx
@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import { AppState } from "../../reducers";
 import PropertyControlFactory from "../../utils/PropertyControlFactory";
 import _ from "lodash";
-import { ControlProps } from "../propertyControls/BaseControl";
+import { ControlProps } from "../../propertyControls/BaseControl";
 import { PropertySection } from "../../reducers/entityReducers/propertyPaneConfigReducer";
 import { updateWidgetProperty } from "../../actions/controlActions";
 
diff --git a/app/client/src/pages/propertyControls/BaseControl.tsx b/app/client/src/propertyControls/BaseControl.tsx
similarity index 93%
rename from app/client/src/pages/propertyControls/BaseControl.tsx
rename to app/client/src/propertyControls/BaseControl.tsx
index 3aa271c104..fd2e933c7f 100644
--- a/app/client/src/pages/propertyControls/BaseControl.tsx
+++ b/app/client/src/propertyControls/BaseControl.tsx
@@ -3,7 +3,7 @@
  * Controls are higher order components that update a widgets property
  */
 import { Component } from "react";
-import { ControlType } from "../../constants/PropertyControlConstants";
+import { ControlType } from "../constants/PropertyControlConstants";
 import _ from "lodash";
 
 abstract class BaseControl<T extends ControlProps> extends Component<T> {
diff --git a/app/client/src/pages/propertyControls/DropDownControl.tsx b/app/client/src/propertyControls/DropDownControl.tsx
similarity index 96%
rename from app/client/src/pages/propertyControls/DropDownControl.tsx
rename to app/client/src/propertyControls/DropDownControl.tsx
index 9adf46f911..2840191547 100644
--- a/app/client/src/pages/propertyControls/DropDownControl.tsx
+++ b/app/client/src/propertyControls/DropDownControl.tsx
@@ -1,6 +1,6 @@
 import React, { SyntheticEvent } from "react";
 import BaseControl, { ControlProps } from "./BaseControl";
-import { ControlType } from "../../constants/PropertyControlConstants";
+import { ControlType } from "../constants/PropertyControlConstants";
 import { Button, MenuItem } from "@blueprintjs/core";
 import { Select, IItemRendererProps } from "@blueprintjs/select";
 
diff --git a/app/client/src/pages/propertyControls/InputTextControl.tsx b/app/client/src/propertyControls/InputTextControl.tsx
similarity index 83%
rename from app/client/src/pages/propertyControls/InputTextControl.tsx
rename to app/client/src/propertyControls/InputTextControl.tsx
index 249141b99d..e9afb61aeb 100644
--- a/app/client/src/pages/propertyControls/InputTextControl.tsx
+++ b/app/client/src/propertyControls/InputTextControl.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import BaseControl, { ControlProps } from "./BaseControl";
-import { ControlType } from "../../constants/PropertyControlConstants";
+import { ControlType } from "../constants/PropertyControlConstants";
 import { InputGroup } from "@blueprintjs/core";
-import { InputType } from "../../widgets/InputWidget";
+import { InputType } from "../widgets/InputWidget";
 
 class InputTextControl extends BaseControl<InputControlProps> {
   render() {
diff --git a/app/client/src/reducers/entityReducers/propertyPaneConfigReducer.tsx b/app/client/src/reducers/entityReducers/propertyPaneConfigReducer.tsx
index fa7f9b3a8e..772ea970b2 100644
--- a/app/client/src/reducers/entityReducers/propertyPaneConfigReducer.tsx
+++ b/app/client/src/reducers/entityReducers/propertyPaneConfigReducer.tsx
@@ -4,9 +4,9 @@ import {
   ReduxAction,
 } from "../../constants/ReduxActionConstants";
 import PropertyPaneConfigResponse from "../../mockResponses/PropertyPaneConfigResponse";
-import { InputControlProps } from "../../pages/propertyControls/InputTextControl";
-import { DropDownControlProps } from "../../pages/propertyControls/DropDownControl";
-import { ControlProps } from "../../pages/propertyControls/BaseControl";
+import { InputControlProps } from "../../propertyControls/InputTextControl";
+import { DropDownControlProps } from "../../propertyControls/DropDownControl";
+import { ControlProps } from "../../propertyControls/BaseControl";
 
 const initialState: PropertyPaneConfigState = PropertyPaneConfigResponse;
 
diff --git a/app/client/src/sagas/ActionSagas.tsx b/app/client/src/sagas/ActionSagas.tsx
index 7f9e11168d..a280036d59 100644
--- a/app/client/src/sagas/ActionSagas.tsx
+++ b/app/client/src/sagas/ActionSagas.tsx
@@ -32,6 +32,7 @@ export function* evaluateJSONPathSaga(jsonPath: string): any {
 
 export function* executeAPIQueryActionSaga(apiAction: ActionPayload) {
   const api: PageAction = yield select(getAction, apiAction.actionId);
+
   const executeActionRequest: ExecuteActionRequest = {
     actionId: apiAction.actionId,
   };
diff --git a/app/client/src/utils/PropertyControlFactory.tsx b/app/client/src/utils/PropertyControlFactory.tsx
index 12f788ec2e..0e764a4145 100644
--- a/app/client/src/utils/PropertyControlFactory.tsx
+++ b/app/client/src/utils/PropertyControlFactory.tsx
@@ -4,7 +4,7 @@ import {
   ControlProps,
   ControlData,
   ControlFunctions,
-} from "../pages/propertyControls/BaseControl";
+} from "../propertyControls/BaseControl";
 
 class PropertyControlFactory {
   static controlMap: Map<ControlType, ControlBuilder<ControlProps>> = new Map();
diff --git a/app/client/src/utils/PropertyControlRegistry.tsx b/app/client/src/utils/PropertyControlRegistry.tsx
index e53d3772fc..397677315c 100644
--- a/app/client/src/utils/PropertyControlRegistry.tsx
+++ b/app/client/src/utils/PropertyControlRegistry.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import PropertyControlFactory from "./PropertyControlFactory";
 import InputTextControl, {
   InputControlProps,
-} from "../pages/propertyControls/InputTextControl";
+} from "../propertyControls/InputTextControl";
 import DropDownControl, {
   DropDownControlProps,
-} from "../pages/propertyControls/DropDownControl";
+} from "../propertyControls/DropDownControl";
 
 class PropertyControlRegistry {
   static registerPropertyControlBuilders() {