Refactorijg

8 files changed, 26 insertions, 26 deletions

diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts
index 146de67253..16237583bf 100644
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@@ -245,27 +245,27 @@ const endpoints: Endpoint[] = [
 	},
 
 	{
-		name: 'reversi/match',
+		name: 'games/reversi/match',
 		withCredential: true
 	},
 
 	{
-		name: 'reversi/match/cancel',
+		name: 'games/reversi/match/cancel',
 		withCredential: true
 	},
 
 	{
-		name: 'reversi/invitations',
+		name: 'games/reversi/invitations',
 		withCredential: true
 	},
 
 	{
-		name: 'reversi/games',
+		name: 'games/reversi/games',
 		withCredential: true
 	},
 
 	{
-		name: 'reversi/games/show'
+		name: 'games/reversi/games/show'
 	},
 
 	{
diff --git a/src/server/api/endpoints/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts
index 11da7b3c0c..585e833ef1 100644
--- a/src/server/api/endpoints/reversi/games.ts
+++ b/src/server/api/endpoints/games/reversi/games.ts
@@ -1,6 +1,6 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
-import ReversiGame, { pack } from '../../../../models/reversi-game';
-import { ILocalUser } from '../../../../models/user';
+import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import ReversiGame, { pack } from '../../../../../models/games/reversi/game';
+import { ILocalUser } from '../../../../../models/user';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'my' parameter
diff --git a/src/server/api/endpoints/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts
index ba52066040..62c37f8e0a 100644
--- a/src/server/api/endpoints/reversi/games/show.ts
+++ b/src/server/api/endpoints/games/reversi/games/show.ts
@@ -1,7 +1,7 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
-import ReversiGame, { pack } from '../../../../../models/reversi-game';
-import Reversi from '../../../../../reversi/core';
-import { ILocalUser } from '../../../../../models/user';
+import $ from 'cafy'; import ID from '../../../../../../cafy-id';
+import ReversiGame, { pack } from '../../../../../../models/games/reversi/game';
+import Reversi from '../../../../../../games/reversi/core';
+import { ILocalUser } from '../../../../../../models/user';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'gameId' parameter
diff --git a/src/server/api/endpoints/reversi/invitations.ts b/src/server/api/endpoints/games/reversi/invitations.ts
index 179abe8cd9..c6d0ecfa73 100644
--- a/src/server/api/endpoints/reversi/invitations.ts
+++ b/src/server/api/endpoints/games/reversi/invitations.ts
@@ -1,5 +1,5 @@
-import Matching, { pack as packMatching } from '../../../../models/reversi-matching';
-import { ILocalUser } from '../../../../models/user';
+import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching';
+import { ILocalUser } from '../../../../../models/user';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Find session
diff --git a/src/server/api/endpoints/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts
index 20473d9a4b..77c014143a 100644
--- a/src/server/api/endpoints/reversi/match.ts
+++ b/src/server/api/endpoints/games/reversi/match.ts
@@ -1,9 +1,9 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
-import Matching, { pack as packMatching } from '../../../../models/reversi-matching';
-import ReversiGame, { pack as packGame } from '../../../../models/reversi-game';
-import User, { ILocalUser } from '../../../../models/user';
-import publishUserStream, { publishReversiStream } from '../../../../publishers/stream';
-import { eighteight } from '../../../../reversi/maps';
+import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching';
+import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game';
+import User, { ILocalUser } from '../../../../../models/user';
+import publishUserStream, { publishReversiStream } from '../../../../../publishers/stream';
+import { eighteight } from '../../../../../games/reversi/maps';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter
diff --git a/src/server/api/endpoints/reversi/match/cancel.ts b/src/server/api/endpoints/games/reversi/match/cancel.ts
index 470d848b53..84cd1ff119 100644
--- a/src/server/api/endpoints/reversi/match/cancel.ts
+++ b/src/server/api/endpoints/games/reversi/match/cancel.ts
@@ -1,5 +1,5 @@
-import Matching from '../../../../../models/reversi-matching';
-import { ILocalUser } from '../../../../../models/user';
+import Matching from '../../../../../../models/games/reversi/matching';
+import { ILocalUser } from '../../../../../../models/user';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	await Matching.remove({
diff --git a/src/server/api/stream/reversi-game.ts b/src/server/api/stream/reversi-game.ts
index ea8a9741d2..7a09e55ecd 100644
--- a/src/server/api/stream/reversi-game.ts
+++ b/src/server/api/stream/reversi-game.ts
@@ -1,10 +1,10 @@
 import * as websocket from 'websocket';
 import * as redis from 'redis';
 import * as CRC32 from 'crc-32';
-import ReversiGame, { pack } from '../../../models/reversi-game';
+import ReversiGame, { pack } from '../../../models/games/reversi/game';
 import { publishReversiGameStream } from '../../../publishers/stream';
-import Reversi from '../../../reversi/core';
-import * as maps from '../../../reversi/maps';
+import Reversi from '../../../games/reversi/core';
+import * as maps from '../../../games/reversi/maps';
 import { ParsedUrlQuery } from 'querystring';
 
 export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void {
diff --git a/src/server/api/stream/reversi.ts b/src/server/api/stream/reversi.ts
index 35c6167364..4e450297ff 100644
--- a/src/server/api/stream/reversi.ts
+++ b/src/server/api/stream/reversi.ts
@@ -1,7 +1,7 @@
 import * as mongo from 'mongodb';
 import * as websocket from 'websocket';
 import * as redis from 'redis';
-import Matching, { pack } from '../../../models/reversi-matching';
+import Matching, { pack } from '../../../models/games/reversi/matching';
 import publishUserStream from '../../../publishers/stream';
 
 export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {