diff --git a/src/reducers/types.js b/src/reducers/types.js
deleted file mode 100644
index bec3df10..00000000
--- a/src/reducers/types.js
+++ /dev/null
@@ -1,9 +0,0 @@
-
-// Servers
-export const LOAD_SERVER = 'shlink/LOAD_SERVER';
-export const FETCH_SERVERS = 'shlink/FETCH_SERVERS';
-export const CREATE_SERVER = 'shlink/CREATE_SERVER';
-
-// Short URLs
-export const LIST_SHORT_URLS = 'shlink/LIST_SHORT_URLS';
-export const UPDATE_SHORT_URLS_LIST = 'shlink/UPDATE_SHORT_URLS_LIST';
diff --git a/src/servers/reducers/selectedServer.js b/src/servers/reducers/selectedServer.js
index 7bb4e10f..d5f53ae0 100644
--- a/src/servers/reducers/selectedServer.js
+++ b/src/servers/reducers/selectedServer.js
@@ -1,6 +1,6 @@
-import { LIST_SHORT_URLS } from '../../reducers/types';
+import { LIST_SHORT_URLS } from '../../short-urls/reducers/shortUrlsList';
 
-export default function selectedServerReducer(state = null, action) {
+export default function reducer(state = null, action) {
   switch (action.type) {
     case LIST_SHORT_URLS:
       return action.selectedServer;
diff --git a/src/servers/reducers/server.js b/src/servers/reducers/server.js
index 79a74430..1dc4ca87 100644
--- a/src/servers/reducers/server.js
+++ b/src/servers/reducers/server.js
@@ -1,7 +1,9 @@
 import ServersService from '../services';
-import { FETCH_SERVERS, CREATE_SERVER } from '../../reducers/types';
 
-export default function serversReducer(state = {}, action) {
+const FETCH_SERVERS = 'shlink/servers/FETCH_SERVERS';
+const CREATE_SERVER = 'shlink/servers/CREATE_SERVER';
+
+export default function reducer(state = {}, action) {
   switch (action.type) {
     case FETCH_SERVERS:
       return action.servers;
diff --git a/src/short-urls/reducers/shortUrlsList.js b/src/short-urls/reducers/shortUrlsList.js
index 7a23e60a..3b3433ac 100644
--- a/src/short-urls/reducers/shortUrlsList.js
+++ b/src/short-urls/reducers/shortUrlsList.js
@@ -1,8 +1,10 @@
-import { LIST_SHORT_URLS, UPDATE_SHORT_URLS_LIST } from '../../reducers/types';
 import ServersService from '../../servers/services';
 import ShlinkApiClient from '../../api/ShlinkApiClient';
 
-export default function shortUrlsListReducer(state = [], action) {
+export const LIST_SHORT_URLS = 'shlink/shortUrlsList/LIST_SHORT_URLS';
+export const UPDATE_SHORT_URLS_LIST = 'shlink/shortUrlsList/UPDATE_SHORT_URLS_LIST';
+
+export default function reducer(state = [], action) {
   switch (action.type) {
     case LIST_SHORT_URLS:
     case UPDATE_SHORT_URLS_LIST:
@@ -24,6 +26,8 @@ export const listShortUrls = (serverId, params = {}) => {
 
 export const updateShortUrlsList = (params = {}) => {
   return async dispatch => {
+
+
     const shortUrls = await ShlinkApiClient.listShortUrls(params);
     dispatch({ type: UPDATE_SHORT_URLS_LIST, shortUrls, params });
   };
diff --git a/src/short-urls/reducers/shortUrlsListParams.js b/src/short-urls/reducers/shortUrlsListParams.js
index 923e4396..9c3e790d 100644
--- a/src/short-urls/reducers/shortUrlsListParams.js
+++ b/src/short-urls/reducers/shortUrlsListParams.js
@@ -1,6 +1,6 @@
-import { UPDATE_SHORT_URLS_LIST } from '../../reducers/types';
+import { UPDATE_SHORT_URLS_LIST } from './shortUrlsList';
 
-export default function shortUrlsListReducer(state = { page: 1 }, action) {
+export default function reducer(state = { page: 1 }, action) {
   switch (action.type) {
     case UPDATE_SHORT_URLS_LIST:
       return { ...state, ...action.params };