diff --git a/README.md b/README.md index a96491a..5c48e79 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ This repository is created just for learning python(Commercial prohibition). | Game26 | angrybirds | 愤怒的小鸟 | [click](./cpgames/modules/core/angrybirds) | [click](https://mp.weixin.qq.com/s/-Z_4PEF7f3ZS1CKd9D6Brg) | | Game27 | flipcardbymemory | 记忆翻牌小游戏 | [click](./cpgames/modules/core/flipcardbymemory) | [click](https://mp.weixin.qq.com/s/H5UisWDWubdaQEBo-sH6iA) | | Game28 | magictower | 魔塔小游戏 | [click](./cpgames/modules/core/magictower) | [click]() | +| Game29 | bloodfootball | 热血足球小游戏 | [click](./cpgames/modules/core/bloodfootball) | [click]() | # Install diff --git a/cpgames/__init__.py b/cpgames/__init__.py index 027b29f..a598e50 100644 --- a/cpgames/__init__.py +++ b/cpgames/__init__.py @@ -5,7 +5,7 @@ '''url''' __url__ = 'https://github.com/CharlesPikachu/Games' '''version''' -__version__ = '0.1.1' +__version__ = '0.1.2' '''author''' __author__ = 'Zhenchao Jin' '''email''' diff --git a/cpgames/modules/__init__.py b/cpgames/core/__init__.py similarity index 90% rename from cpgames/modules/__init__.py rename to cpgames/core/__init__.py index 0c57121..e186339 100644 --- a/cpgames/modules/__init__.py +++ b/cpgames/core/__init__.py @@ -1,7 +1,7 @@ '''initialize''' -from .core import ( +from .games import ( SkiGame, MazeGame, GobangGame, TetrisGame, PacmanGame, GemGemGame, TankWarGame, SokobanGame, PingpongGame, TRexRushGame, BomberManGame, WhacAMoleGame, CatchCoinsGame, FlappyBirdGame, AngryBirdsGame, MagicTowerGame, AircraftWarGame, BunnyBadgerGame, MineSweeperGame, GreedySnakeGame, PuzzlePiecesGame, TowerDefenseGame, AlienInvasionGame, BreakoutcloneGame, TwentyfourPointGame, - FlipCardByMemoryGame, TwoZeroFourEightGame, VoiceControlPikachuGame + FlipCardByMemoryGame, TwoZeroFourEightGame, VoiceControlPikachuGame, BloodFootballGame ) \ No newline at end of file diff --git a/cpgames/modules/core/__init__.py b/cpgames/core/games/__init__.py similarity index 96% rename from cpgames/modules/core/__init__.py rename to cpgames/core/games/__init__.py index 36a07f1..34349c7 100644 --- a/cpgames/modules/core/__init__.py +++ b/cpgames/core/games/__init__.py @@ -23,6 +23,7 @@ from .towerdefense import TowerDefenseGame from .alieninvasion import AlienInvasionGame from .breakoutclone import BreakoutcloneGame +from .bloodfootball import BloodFootballGame from .twentyfourpoint import TwentyfourPointGame from .flipcardbymemory import FlipCardByMemoryGame from .twozerofoureight import TwoZeroFourEightGame diff --git a/cpgames/modules/core/aircraftwar/__init__.py b/cpgames/core/games/aircraftwar/__init__.py similarity index 100% rename from cpgames/modules/core/aircraftwar/__init__.py rename to cpgames/core/games/aircraftwar/__init__.py diff --git a/cpgames/modules/core/aircraftwar/aircraftwar.py b/cpgames/core/games/aircraftwar/aircraftwar.py similarity index 100% rename from cpgames/modules/core/aircraftwar/aircraftwar.py rename to cpgames/core/games/aircraftwar/aircraftwar.py diff --git a/cpgames/modules/core/aircraftwar/modules/__init__.py b/cpgames/core/games/aircraftwar/modules/__init__.py similarity index 100% rename from cpgames/modules/core/aircraftwar/modules/__init__.py rename to cpgames/core/games/aircraftwar/modules/__init__.py diff --git a/cpgames/modules/core/aircraftwar/modules/interfaces.py b/cpgames/core/games/aircraftwar/modules/interfaces.py similarity index 100% rename from cpgames/modules/core/aircraftwar/modules/interfaces.py rename to cpgames/core/games/aircraftwar/modules/interfaces.py diff --git a/cpgames/modules/core/aircraftwar/modules/sprites.py b/cpgames/core/games/aircraftwar/modules/sprites.py similarity index 100% rename from cpgames/modules/core/aircraftwar/modules/sprites.py rename to cpgames/core/games/aircraftwar/modules/sprites.py diff --git a/cpgames/modules/core/aircraftwar/resources/audios/Cool Space Music.mp3 b/cpgames/core/games/aircraftwar/resources/audios/Cool Space Music.mp3 similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/audios/Cool Space Music.mp3 rename to cpgames/core/games/aircraftwar/resources/audios/Cool Space Music.mp3 diff --git a/cpgames/modules/core/aircraftwar/resources/audios/boom.wav b/cpgames/core/games/aircraftwar/resources/audios/boom.wav similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/audios/boom.wav rename to cpgames/core/games/aircraftwar/resources/audios/boom.wav diff --git a/cpgames/modules/core/aircraftwar/resources/audios/shot.ogg b/cpgames/core/games/aircraftwar/resources/audios/shot.ogg similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/audios/shot.ogg rename to cpgames/core/games/aircraftwar/resources/audios/shot.ogg diff --git a/cpgames/modules/core/aircraftwar/resources/images/asteroid.png b/cpgames/core/games/aircraftwar/resources/images/asteroid.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/asteroid.png rename to cpgames/core/games/aircraftwar/resources/images/asteroid.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/bg_big.png b/cpgames/core/games/aircraftwar/resources/images/bg_big.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/bg_big.png rename to cpgames/core/games/aircraftwar/resources/images/bg_big.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/bullet.png b/cpgames/core/games/aircraftwar/resources/images/bullet.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/bullet.png rename to cpgames/core/games/aircraftwar/resources/images/bullet.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/seamless_space.png b/cpgames/core/games/aircraftwar/resources/images/seamless_space.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/seamless_space.png rename to cpgames/core/games/aircraftwar/resources/images/seamless_space.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/ship.png b/cpgames/core/games/aircraftwar/resources/images/ship.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/ship.png rename to cpgames/core/games/aircraftwar/resources/images/ship.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/ship_exploded.png b/cpgames/core/games/aircraftwar/resources/images/ship_exploded.png similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/ship_exploded.png rename to cpgames/core/games/aircraftwar/resources/images/ship_exploded.png diff --git a/cpgames/modules/core/aircraftwar/resources/images/space3.jpg b/cpgames/core/games/aircraftwar/resources/images/space3.jpg similarity index 100% rename from cpgames/modules/core/aircraftwar/resources/images/space3.jpg rename to cpgames/core/games/aircraftwar/resources/images/space3.jpg diff --git a/cpgames/modules/core/alieninvasion/__init__.py b/cpgames/core/games/alieninvasion/__init__.py similarity index 100% rename from cpgames/modules/core/alieninvasion/__init__.py rename to cpgames/core/games/alieninvasion/__init__.py diff --git a/cpgames/modules/core/alieninvasion/alieninvasion.py b/cpgames/core/games/alieninvasion/alieninvasion.py similarity index 100% rename from cpgames/modules/core/alieninvasion/alieninvasion.py rename to cpgames/core/games/alieninvasion/alieninvasion.py diff --git a/cpgames/modules/core/alieninvasion/modules/__init__.py b/cpgames/core/games/alieninvasion/modules/__init__.py similarity index 100% rename from cpgames/modules/core/alieninvasion/modules/__init__.py rename to cpgames/core/games/alieninvasion/modules/__init__.py diff --git a/cpgames/modules/core/alieninvasion/modules/sprites.py b/cpgames/core/games/alieninvasion/modules/sprites.py similarity index 100% rename from cpgames/modules/core/alieninvasion/modules/sprites.py rename to cpgames/core/games/alieninvasion/modules/sprites.py diff --git a/cpgames/modules/core/alieninvasion/modules/utils.py b/cpgames/core/games/alieninvasion/modules/utils.py similarity index 100% rename from cpgames/modules/core/alieninvasion/modules/utils.py rename to cpgames/core/games/alieninvasion/modules/utils.py diff --git a/cpgames/modules/core/alieninvasion/resources/bgm.mp3 b/cpgames/core/games/alieninvasion/resources/bgm.mp3 similarity index 100% rename from cpgames/modules/core/alieninvasion/resources/bgm.mp3 rename to cpgames/core/games/alieninvasion/resources/bgm.mp3 diff --git a/cpgames/modules/core/alieninvasion/score b/cpgames/core/games/alieninvasion/score similarity index 100% rename from cpgames/modules/core/alieninvasion/score rename to cpgames/core/games/alieninvasion/score diff --git a/cpgames/modules/core/angrybirds/__init__.py b/cpgames/core/games/angrybirds/__init__.py similarity index 100% rename from cpgames/modules/core/angrybirds/__init__.py rename to cpgames/core/games/angrybirds/__init__.py diff --git a/cpgames/modules/core/angrybirds/angrybirds.py b/cpgames/core/games/angrybirds/angrybirds.py similarity index 100% rename from cpgames/modules/core/angrybirds/angrybirds.py rename to cpgames/core/games/angrybirds/angrybirds.py diff --git a/cpgames/modules/core/angrybirds/modules/__init__.py b/cpgames/core/games/angrybirds/modules/__init__.py similarity index 100% rename from cpgames/modules/core/angrybirds/modules/__init__.py rename to cpgames/core/games/angrybirds/modules/__init__.py diff --git a/cpgames/modules/core/angrybirds/modules/gamelevels.py b/cpgames/core/games/angrybirds/modules/gamelevels.py similarity index 100% rename from cpgames/modules/core/angrybirds/modules/gamelevels.py rename to cpgames/core/games/angrybirds/modules/gamelevels.py diff --git a/cpgames/modules/core/angrybirds/modules/misc.py b/cpgames/core/games/angrybirds/modules/misc.py similarity index 100% rename from cpgames/modules/core/angrybirds/modules/misc.py rename to cpgames/core/games/angrybirds/modules/misc.py diff --git a/cpgames/modules/core/angrybirds/modules/sprites.py b/cpgames/core/games/angrybirds/modules/sprites.py similarity index 100% rename from cpgames/modules/core/angrybirds/modules/sprites.py rename to cpgames/core/games/angrybirds/modules/sprites.py diff --git a/cpgames/modules/core/angrybirds/resources/audios/bgm.ogg b/cpgames/core/games/angrybirds/resources/audios/bgm.ogg similarity index 100% rename from cpgames/modules/core/angrybirds/resources/audios/bgm.ogg rename to cpgames/core/games/angrybirds/resources/audios/bgm.ogg diff --git a/cpgames/modules/core/angrybirds/resources/fonts/Comic_Kings.ttf b/cpgames/core/games/angrybirds/resources/fonts/Comic_Kings.ttf similarity index 100% rename from cpgames/modules/core/angrybirds/resources/fonts/Comic_Kings.ttf rename to cpgames/core/games/angrybirds/resources/fonts/Comic_Kings.ttf diff --git a/cpgames/modules/core/angrybirds/resources/fonts/arfmoochikncheez.ttf b/cpgames/core/games/angrybirds/resources/fonts/arfmoochikncheez.ttf similarity index 100% rename from cpgames/modules/core/angrybirds/resources/fonts/arfmoochikncheez.ttf rename to cpgames/core/games/angrybirds/resources/fonts/arfmoochikncheez.ttf diff --git a/cpgames/modules/core/angrybirds/resources/images/bird.png b/cpgames/core/games/angrybirds/resources/images/bird.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/bird.png rename to cpgames/core/games/angrybirds/resources/images/bird.png diff --git a/cpgames/modules/core/angrybirds/resources/images/block.png b/cpgames/core/games/angrybirds/resources/images/block.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/block.png rename to cpgames/core/games/angrybirds/resources/images/block.png diff --git a/cpgames/modules/core/angrybirds/resources/images/block_destroyed.png b/cpgames/core/games/angrybirds/resources/images/block_destroyed.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/block_destroyed.png rename to cpgames/core/games/angrybirds/resources/images/block_destroyed.png diff --git a/cpgames/modules/core/angrybirds/resources/images/pig_1.png b/cpgames/core/games/angrybirds/resources/images/pig_1.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/pig_1.png rename to cpgames/core/games/angrybirds/resources/images/pig_1.png diff --git a/cpgames/modules/core/angrybirds/resources/images/pig_2.png b/cpgames/core/games/angrybirds/resources/images/pig_2.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/pig_2.png rename to cpgames/core/games/angrybirds/resources/images/pig_2.png diff --git a/cpgames/modules/core/angrybirds/resources/images/pig_damaged.png b/cpgames/core/games/angrybirds/resources/images/pig_damaged.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/pig_damaged.png rename to cpgames/core/games/angrybirds/resources/images/pig_damaged.png diff --git a/cpgames/modules/core/angrybirds/resources/images/wall_horizontal.png b/cpgames/core/games/angrybirds/resources/images/wall_horizontal.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/wall_horizontal.png rename to cpgames/core/games/angrybirds/resources/images/wall_horizontal.png diff --git a/cpgames/modules/core/angrybirds/resources/images/wall_vertical.png b/cpgames/core/games/angrybirds/resources/images/wall_vertical.png similarity index 100% rename from cpgames/modules/core/angrybirds/resources/images/wall_vertical.png rename to cpgames/core/games/angrybirds/resources/images/wall_vertical.png diff --git a/cpgames/modules/core/base/__init__.py b/cpgames/core/games/base/__init__.py similarity index 100% rename from cpgames/modules/core/base/__init__.py rename to cpgames/core/games/base/__init__.py diff --git a/cpgames/modules/core/base/basegame.py b/cpgames/core/games/base/basegame.py similarity index 100% rename from cpgames/modules/core/base/basegame.py rename to cpgames/core/games/base/basegame.py diff --git a/cpgames/modules/core/base/resources/audios/liuyuedeyu.mp3 b/cpgames/core/games/base/resources/audios/liuyuedeyu.mp3 similarity index 100% rename from cpgames/modules/core/base/resources/audios/liuyuedeyu.mp3 rename to cpgames/core/games/base/resources/audios/liuyuedeyu.mp3 diff --git a/cpgames/modules/core/base/resources/fonts/Gabriola.ttf b/cpgames/core/games/base/resources/fonts/Gabriola.ttf similarity index 100% rename from cpgames/modules/core/base/resources/fonts/Gabriola.ttf rename to cpgames/core/games/base/resources/fonts/Gabriola.ttf diff --git a/cpgames/modules/core/base/resources/fonts/MaiandraGD.ttf b/cpgames/core/games/base/resources/fonts/MaiandraGD.ttf similarity index 100% rename from cpgames/modules/core/base/resources/fonts/MaiandraGD.ttf rename to cpgames/core/games/base/resources/fonts/MaiandraGD.ttf diff --git a/cpgames/modules/core/base/resources/fonts/simkai.ttf b/cpgames/core/games/base/resources/fonts/simkai.ttf similarity index 100% rename from cpgames/modules/core/base/resources/fonts/simkai.ttf rename to cpgames/core/games/base/resources/fonts/simkai.ttf diff --git a/cpgames/core/games/bloodfootball/__init__.py b/cpgames/core/games/bloodfootball/__init__.py new file mode 100644 index 0000000..f02ef60 --- /dev/null +++ b/cpgames/core/games/bloodfootball/__init__.py @@ -0,0 +1,2 @@ +'''initialize''' +from .bloodfootball import BloodFootballGame \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/bloodfootball.py b/cpgames/core/games/bloodfootball/bloodfootball.py new file mode 100644 index 0000000..df488a1 --- /dev/null +++ b/cpgames/core/games/bloodfootball/bloodfootball.py @@ -0,0 +1,160 @@ +''' +Function: + 简单的热血足球小游戏 +Author: + Charles +微信公众号: + Charles的皮卡丘 +''' +import os +import random +import pygame +from ...utils import QuitGame +from ..base import PygameBaseGame +from .modules import StartInterface, Player, Ball + + +'''配置类''' +class Config(): + # 根目录 + rootdir = os.path.split(os.path.abspath(__file__))[0] + # FPS + FPS = 50 + # 屏幕大小 + SCREENSIZE = (769, 563) + SCREENSIZE_GAMING = (1200, 800) + # 标题 + TITLE = '热血足球 —— Charles的皮卡丘' + # 一些颜色 + WHITE = (255, 255, 255) + RED = (255, 0, 0) + LIGHTGREEN = (0, 100, 0) + # 背景音乐路径 + BGM_PATH = os.path.join(rootdir, 'resources/audios/bgm.flac') + # 游戏图片路径 + IMAGE_PATHS_DICT = { + 'players': [ + os.path.join(rootdir, 'resources/images/player1.png'), + os.path.join(rootdir, 'resources/images/player2.png'), + os.path.join(rootdir, 'resources/images/player3.png'), + os.path.join(rootdir, 'resources/images/player4.png'), + ], + 'balls': [ + os.path.join(rootdir, 'resources/images/ball1.png'), + os.path.join(rootdir, 'resources/images/ball2.png'), + os.path.join(rootdir, 'resources/images/ball3.png'), + ], + 'doors': [ + os.path.join(rootdir, 'resources/images/door1.bmp'), + os.path.join(rootdir, 'resources/images/door2.bmp'), + ], + 'background_start': os.path.join(rootdir, 'resources/images/background_start.jpg'), + } + # 字体路径 + FONT_PATHS_DICT = { + 'default20': {'name': os.path.join(rootdir.replace('bloodfootball', 'base'), 'resources/fonts/simkai.ttf'), 'size': 20}, + 'default30': {'name': os.path.join(rootdir.replace('bloodfootball', 'base'), 'resources/fonts/simkai.ttf'), 'size': 30}, + 'default50': {'name': os.path.join(rootdir.replace('bloodfootball', 'base'), 'resources/fonts/simkai.ttf'), 'size': 50}, + } + + +'''简单的热血足球小游戏''' +class BloodFootballGame(PygameBaseGame): + game_type = 'bloodfootball' + def __init__(self, **kwargs): + self.cfg = Config + super(BloodFootballGame, self).__init__(config=self.cfg, **kwargs) + '''运行游戏''' + def run(self): + # 初始化 + screen, resource_loader, cfg = self.screen, self.resource_loader, self.cfg + resource_loader.playbgm() + # 游戏开始界面 + StartInterface(screen, resource_loader, cfg) + # 游戏主循环 + screen = pygame.display.set_mode(cfg.SCREENSIZE_GAMING) + score_group1, score_group2 = 0, 0 + font = resource_loader.fonts['default30'] + while True: + win_group = self.playonegame(screen, resource_loader, cfg, font.render(f'{score_group1} {score_group2}', False, cfg.WHITE)) + assert win_group in [1, 2] + if win_group == 1: score_group1 += 1 + else: score_group2 += 1 + '''进行一场游戏''' + def playonegame(self, screen, resource_loader, cfg, score_board): + # 初始化双方球员 + players_group1, players_group2 = pygame.sprite.Group(), pygame.sprite.Group() + # --第一组 + position = random.randint(250, 500), random.randint(350-25, 450-25) + player_controlled = Player(resource_loader.images['players'][0], position, (1, 0), False, 'common', 1) + players_group1.add(player_controlled) + position = random.randint(250, 500), random.randint(50-25, 350-25) + players_group1.add(Player(resource_loader.images['players'][1], position, (1, 0), True, 'upperhalf', 1)) + position = random.randint(250, 500), random.randint(450-25, 750-25) + players_group1.add(Player(resource_loader.images['players'][1], position, (1, 0), True, 'bottomhalf', 1)) + position = (85, 390) + players_group1.add(Player(resource_loader.images['players'][1], position, (0, 1), True, 'goalkeeper', 1)) + # --第二组 + position = random.randint(700, 950), random.randint(350-25, 450-25) + players_group2.add(Player(resource_loader.images['players'][2], position, (-1, 0), True, 'common', 2)) + position = random.randint(700, 950), random.randint(50-25, 350-25) + players_group2.add(Player(resource_loader.images['players'][3], position, (-1, 0), True, 'upperhalf', 2)) + position = random.randint(700, 950), random.randint(450-25, 750-25) + players_group2.add(Player(resource_loader.images['players'][3], position, (-1, 0), True, 'bottomhalf', 2)) + position = (1070, 390) + players_group2.add(Player(resource_loader.images['players'][3], position, (0, 1), True, 'goalkeeper', 2)) + # 初始化足球 + ball = Ball(resource_loader.images['balls'], (600, 400)) + # 游戏主循环 + clock = pygame.time.Clock() + while True: + # --基础背景绘制 + screen.fill(cfg.LIGHTGREEN) + pygame.draw.circle(screen, cfg.WHITE, (600, 400), 80, 5) + pygame.draw.rect(screen, cfg.WHITE, (10, 10, 600, 790), 5) + pygame.draw.rect(screen, cfg.WHITE, (600, 10, 590, 790), 5) + pygame.draw.rect(screen, cfg.WHITE, (10, 150, 300, 500), 5) + pygame.draw.rect(screen, cfg.WHITE, (890, 150, 300, 500), 5) + screen.blit(resource_loader.images['doors'][0].convert(), (8, 305)) + screen.blit(resource_loader.images['doors'][1].convert(), (1121, 305)) + screen.blit(score_board, (565, 15)) + # --事件监听 + for event in pygame.event.get(): + if event.type == pygame.QUIT: + QuitGame() + elif event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE: + QuitGame() + pressed_keys = pygame.key.get_pressed() + direction = [0, 0] + if pressed_keys[pygame.K_w]: direction[1] -= 1 + if pressed_keys[pygame.K_d]: direction[0] += 1 + if pressed_keys[pygame.K_s]: direction[1] += 1 + if pressed_keys[pygame.K_a]: direction[0] -= 1 + if direction != [0, 0]: player_controlled.setdirection(direction) + if pressed_keys[pygame.K_SPACE] and player_controlled == ball.taken_by_player: + ball.kick(player_controlled.direction) + # --更新玩家 + for item in players_group1: + if pygame.sprite.collide_mask(item, ball) and ball.taken_by_player != item: + ball.is_moving = True + ball.taken_by_player = item + for item in players_group2: + if pygame.sprite.collide_mask(item, ball) and ball.taken_by_player != item: + ball.is_moving = True + ball.taken_by_player = item + for item in players_group1: + item.update(cfg.SCREENSIZE_GAMING, ball) + for item in players_group2: + item.update(cfg.SCREENSIZE_GAMING, ball) + # --更新球 + ball.update(cfg.SCREENSIZE_GAMING) + # --更新屏幕 + ball.draw(screen) + players_group1.draw(screen) + players_group2.draw(screen) + clock.tick(cfg.FPS) + pygame.display.update() + # --计算得分 + if ball.rect.bottom > 305 and ball.rect.top < 505: + if ball.rect.right > 1121: return 1 + elif ball.rect.left < 75: return 2 \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/modules/__init__.py b/cpgames/core/games/bloodfootball/modules/__init__.py new file mode 100644 index 0000000..fee3d5f --- /dev/null +++ b/cpgames/core/games/bloodfootball/modules/__init__.py @@ -0,0 +1,4 @@ +'''initialize''' +from .ball import Ball +from .player import Player +from .startinterface import StartInterface \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/modules/ball.py b/cpgames/core/games/bloodfootball/modules/ball.py new file mode 100644 index 0000000..39f1861 --- /dev/null +++ b/cpgames/core/games/bloodfootball/modules/ball.py @@ -0,0 +1,89 @@ +''' +Function: + 定义足球类 +Author: + Charles +微信公众号: + Charles的皮卡丘 +''' +import math +import pygame + + +'''定义足球类''' +class Ball(pygame.sprite.Sprite): + def __init__(self, images, position): + pygame.sprite.Sprite.__init__(self) + self.images = images + self.image = self.images[0] + self.rect = self.image.get_rect() + self.rect.centerx, self.rect.centery = position + self.mask = pygame.mask.from_surface(self.image) + # 球的速度 + self.speed = 0 + # 球的方向 + self.direction = [0, 0] + # 控制球的球员 + self.taken_by_player = None + # 用于切换球动作的变量 + self.action_pointer = 0 + self.count = 0 + self.switch_frequency = 3 + # 是否在运动状态 + self.is_moving = False + '''更新''' + def update(self, screen_size): + # 静止状态 + if not self.is_moving: return + # 切换球动作实现动画效果 + self.count += 1 + if self.count == self.switch_frequency: + self.count = 0 + self.action_pointer = (self.action_pointer + 1) % len(self.images) + self.image = self.images[self.action_pointer] + # 如果球是被球员控制的 + if self.taken_by_player is not None: + self.setdirection(self.taken_by_player.direction) + if self.taken_by_player.direction[0] < 0: + self.rect.left, self.rect.top = self.taken_by_player.rect.left - 15, self.taken_by_player.rect.top + 30 + elif self.taken_by_player.direction[0] > 0: + self.rect.left, self.rect.top = self.taken_by_player.rect.left + 30, self.taken_by_player.rect.top + 30 + elif self.taken_by_player.direction[1] < 0: + self.rect.left, self.rect.top = self.taken_by_player.rect.left + 15, self.taken_by_player.rect.top - 15 + elif self.taken_by_player.direction[1] > 0: + self.rect.left, self.rect.top = self.taken_by_player.rect.left + 10, self.taken_by_player.rect.top + 50 + return + # 根据方向移动球 + ori_position = self.rect.left, self.rect.right, self.rect.top, self.rect.bottom + self.speed = max(self.speed - 1.7 * 0.05, 0.0) + if self.speed == 0.0: self.is_moving = False + vector = [self.speed * self.direction[0], self.speed * self.direction[1]] + vector[0] = vector[0] / math.pow(self.direction[0] ** 2 + self.direction[1] ** 2, 0.5) + vector[1] = vector[1] / math.pow(self.direction[0] ** 2 + self.direction[1] ** 2, 0.5) + self.rect.left = min(max(0, self.rect.left + vector[0]), screen_size[0] - 48) + if self.rect.left == 0 or self.rect.left == screen_size[0] - 48: + self.direction = self.direction[0] * -0.8, self.direction[1] + self.rect.top = min(max(0, self.rect.top + vector[1]), screen_size[1] - 48) + if ori_position[1] > 1121 or ori_position[0] < 75: + if self.rect.bottom > 305 and self.rect.top < 505: + if self.direction[1] > 0: + self.rect.bottom = 305 + self.direction = self.direction[0], self.direction[1] * -0.8 + elif self.direction[1] < 0: + self.rect.top = 505 + self.direction = self.direction[0], self.direction[1] * -0.8 + if self.rect.top == 0 or self.rect.top == screen_size[1] - 48: + self.direction = self.direction[0], self.direction[1] * -0.8 + '''设置方向''' + def setdirection(self, direction): + self.is_moving = True + self.direction = direction + '''踢球''' + def kick(self, direction): + self.speed = 12 + self.direction = direction + self.taken_by_player = None + self.is_moving = True + '''在屏幕上显示''' + def draw(self, screen): + screen.blit(self.image, self.rect) \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/modules/player.py b/cpgames/core/games/bloodfootball/modules/player.py new file mode 100644 index 0000000..7634208 --- /dev/null +++ b/cpgames/core/games/bloodfootball/modules/player.py @@ -0,0 +1,197 @@ +''' +Function: + 定义球员类 +Author: + Charles +微信公众号: + Charles的皮卡丘 +''' +import random +import pygame + + +'''定义球员类''' +class Player(pygame.sprite.Sprite): + def __init__(self, image, position, direction=(1, 0), auto_control=False, player_type=None, group_id=None): + pygame.sprite.Sprite.__init__(self) + self.images_dict = { + 'down': [ + image.subsurface((0, 0, 32, 48)), image.subsurface((32, 0, 32, 48)), + image.subsurface((64, 0, 32, 48)), image.subsurface((96, 0, 32, 48)) + ], + 'left': [ + image.subsurface((0, 48, 32, 48)), image.subsurface((32, 48, 32, 48)), + image.subsurface((64, 48, 32, 48)), image.subsurface((96, 48, 32, 48)) + ], + 'right': [ + image.subsurface((0, 96, 32, 48)), image.subsurface((32, 96, 32, 48)), + image.subsurface((64, 96, 32, 48)), image.subsurface((96, 96, 32, 48)) + ], + 'up': [ + image.subsurface((0, 144, 32, 48)), image.subsurface((32, 144, 32, 48)), + image.subsurface((64, 144, 32, 48)), image.subsurface((96, 144, 32, 48)) + ], + } + self.position = list(position) + self.auto_control = auto_control + self.player_type = player_type + self.group_id = group_id + # 用于切换人物动作的变量 + self.action_pointer = 0 + self.count = 0 + self.switch_frequency = 3 + # 设置方向 + self.setdirection(direction) + # 人物速度 + self.speed = 2 + # 是否在运动状态 + self.is_moving = False + # 准备踢球动作的变量 + self.prepare_for_kicking = False + self.prepare_for_kicking_count = 0 + self.prepare_for_kicking_freq = 20 + # 保持运动方向的变量 + self.keep_direction_freq = 50 + self.keep_direction_count = 50 + '''更新''' + def update(self, screen_size, ball): + # 电脑自动控制 + if self.auto_control: + self.autoupdate(screen_size, ball) + return + # 静止状态 + if not self.is_moving: return + # 切换人物动作实现动画效果 + self.switch() + # 根据方向移动人物 + ori_position = self.position.copy() + speed = self.speed * self.direction[0], self.speed * self.direction[1] + self.position[0] = min(max(0, self.position[0] + speed[0]), screen_size[0] - 48) + self.position[1] = min(max(0, self.position[1] + speed[1]), screen_size[1] - 48) + self.rect.left, self.rect.top = self.position + if self.rect.bottom > 305 and self.rect.top < 505 and (self.rect.right > 1121 or self.rect.left < 75): + self.position = ori_position + self.rect.left, self.rect.top = self.position + # 设置为静止状态 + self.is_moving = False + '''自动更新''' + def autoupdate(self, screen_size, ball): + # 守门员 + if self.player_type == 'goalkeeper': + self.speed = 1 + # --沿着门漫步 + def wondering(self): + self.switch() + self.position[1] = min(max(305, self.position[1] + self.direction[1] * self.speed), 459) + self.rect.left, self.rect.top = self.position + if self.rect.top == 305 or self.rect.top == 459: + self.direction = self.direction[0], -self.direction[1] + self.setdirection(self.direction) + # --有球就随机射球 + if ball.taken_by_player == self: + if self.group_id == 1: + if random.random() > 0.8 or self.prepare_for_kicking: + self.prepare_for_kicking = True + self.setdirection((1, 0)) + if self.prepare_for_kicking: + self.prepare_for_kicking_count += 1 + if self.prepare_for_kicking_count > self.prepare_for_kicking_freq: + self.prepare_for_kicking_count = 0 + self.prepare_for_kicking = False + ball.kick(self.direction) + self.setdirection(random.choice([(0, 1), (0, -1)])) + else: + wondering(self) + else: + if random.random() > 0.8 or self.prepare_for_kicking: + self.prepare_for_kicking = True + self.setdirection((-1, 0)) + if self.prepare_for_kicking: + self.prepare_for_kicking_count += 1 + if self.prepare_for_kicking_count > self.prepare_for_kicking_freq: + self.prepare_for_kicking_count = 0 + self.prepare_for_kicking = False + ball.kick(self.direction) + self.setdirection(random.choice([(0, 1), (0, -1)])) + else: + wondering(self) + # --没球来回走 + else: + wondering(self) + # 其他球员跟着球走 + else: + if ball.taken_by_player == self: + self.switch() + if self.group_id == 1: + self.direction = min(max(1150 - self.rect.left, -1), 1), min(max(405 - self.rect.top, -1), 1) + else: + self.direction = min(max(350 - self.rect.left, -1), 1), min(max(405 - self.rect.top, -1), 1) + self.setdirection(self.direction) + if (random.random() > 0.9 and self.position[0] > 350 and self.position[0] < 1150) or self.prepare_for_kicking: + if self.group_id == 1: + self.direction = min(max(1190 - self.rect.left, -1), 1), min(max(405 - self.rect.top, -1), 1) + else: + self.direction = min(max(310 - self.rect.left, -1), 1), min(max(405 - self.rect.top, -1), 1) + self.setdirection(self.direction) + self.prepare_for_kicking = True + if self.prepare_for_kicking: + self.prepare_for_kicking_count += 1 + if self.prepare_for_kicking_count > self.prepare_for_kicking_freq: + self.prepare_for_kicking_count = 0 + self.prepare_for_kicking = False + ball.kick(self.direction) + else: + speed = self.speed * self.direction[0], self.speed * self.direction[1] + ori_position = self.position.copy() + self.position[0] = min(max(0, self.position[0] + speed[0]), screen_size[0] - 48) + self.position[1] = min(max(0, self.position[1] + speed[1]), screen_size[1] - 48) + self.rect.left, self.rect.top = self.position + if self.rect.bottom > 305 and self.rect.top < 505 and (self.rect.right > 1121 or self.rect.left < 75): + self.position = ori_position + self.rect.left, self.rect.top = self.position + else: + self.switch() + if (ball.rect.centery > 400 and self.player_type == 'bottomhalf') or (ball.rect.centery <= 400 and self.player_type == 'upperhalf') or self.player_type == 'common': + self.direction = min(max(ball.rect.left - self.rect.left, -1), 1), min(max(ball.rect.top - self.rect.top, -1), 1) + self.direction = self.direction[0] * random.random(), self.direction[1] * random.random() + else: + if self.keep_direction_count >= self.keep_direction_freq: + self.direction = random.choice([-1, 0, 1]), random.choice([-1, 0, 1]) + self.keep_direction_count = 0 + else: + self.keep_direction_count += 1 + self.setdirection(self.direction) + speed = self.speed * self.direction[0], self.speed * self.direction[1] + ori_position = self.position.copy() + self.position[0] = min(max(0, self.position[0] + speed[0]), screen_size[0] - 48) + self.position[1] = min(max(0, self.position[1] + speed[1]), screen_size[1] - 48) + self.rect.left, self.rect.top = self.position + if self.rect.bottom > 305 and self.rect.top < 505 and (self.rect.right > 1121 or self.rect.left < 75): + self.position = ori_position + self.rect.left, self.rect.top = self.position + '''切换人物动作实现动画效果''' + def switch(self): + self.count += 1 + if self.count == self.switch_frequency: + self.count = 0 + self.action_pointer = (self.action_pointer + 1) % len(self.images) + self.image = self.images[self.action_pointer] + '''设置方向''' + def setdirection(self, direction): + self.direction = direction + self.is_moving = True + self.images = self.fetchimages(direction) + self.image = self.images[self.action_pointer] + self.rect = self.image.get_rect() + self.rect.left, self.rect.top = self.position + self.mask = pygame.mask.from_surface(self.image) + '''根据方向获得图片''' + def fetchimages(self, direction): + if direction[0] > 0: return self.images_dict['right'] + elif direction[0] < 0: return self.images_dict['left'] + elif direction[1] > 0: return self.images_dict['down'] + elif direction[1] < 0: return self.images_dict['up'] + else: return self.images + '''在屏幕上显示''' + def draw(self, screen): + screen.blit(self.image, self.rect) \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/modules/startinterface.py b/cpgames/core/games/bloodfootball/modules/startinterface.py new file mode 100644 index 0000000..07332ba --- /dev/null +++ b/cpgames/core/games/bloodfootball/modules/startinterface.py @@ -0,0 +1,29 @@ +''' +Function: + 定义游戏开始界面 +Author: + Charles +微信公众号: + Charles的皮卡丘 +''' +import pygame +from ....utils import QuitGame + + +'''定义游戏开始界面''' +def StartInterface(screen, resource_loader, cfg): + clock = pygame.time.Clock() + font, flag, count = resource_loader.fonts['default30'], True, 0 + font_render = font.render('按任意键开始游戏', False, cfg.RED) + while True: + count += 1 + if count > 20: count, flag = 0, not flag + for event in pygame.event.get(): + if event.type == pygame.QUIT: + QuitGame() + elif event.type == pygame.KEYDOWN: + return True + screen.blit(resource_loader.images['background_start'], (0, 0)) + if flag: screen.blit(font_render, ((cfg.SCREENSIZE[0] - font.size('按任意键开始游戏')[0]) // 2, cfg.SCREENSIZE[1] - 200)) + clock.tick(cfg.FPS) + pygame.display.update() \ No newline at end of file diff --git a/cpgames/core/games/bloodfootball/resources/audios/bgm.flac b/cpgames/core/games/bloodfootball/resources/audios/bgm.flac new file mode 100644 index 0000000..8c39822 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/audios/bgm.flac differ diff --git a/cpgames/core/games/bloodfootball/resources/images/background_start.jpg b/cpgames/core/games/bloodfootball/resources/images/background_start.jpg new file mode 100644 index 0000000..9a4f9aa Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/background_start.jpg differ diff --git a/cpgames/core/games/bloodfootball/resources/images/ball1.png b/cpgames/core/games/bloodfootball/resources/images/ball1.png new file mode 100644 index 0000000..f966ed1 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/ball1.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/ball2.png b/cpgames/core/games/bloodfootball/resources/images/ball2.png new file mode 100644 index 0000000..ca8b8c6 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/ball2.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/ball3.png b/cpgames/core/games/bloodfootball/resources/images/ball3.png new file mode 100644 index 0000000..e34813a Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/ball3.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/door1.bmp b/cpgames/core/games/bloodfootball/resources/images/door1.bmp new file mode 100644 index 0000000..8b7c70f Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/door1.bmp differ diff --git a/cpgames/core/games/bloodfootball/resources/images/door2.bmp b/cpgames/core/games/bloodfootball/resources/images/door2.bmp new file mode 100644 index 0000000..63e601f Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/door2.bmp differ diff --git a/cpgames/core/games/bloodfootball/resources/images/player1.png b/cpgames/core/games/bloodfootball/resources/images/player1.png new file mode 100644 index 0000000..2b2323d Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/player1.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/player2.png b/cpgames/core/games/bloodfootball/resources/images/player2.png new file mode 100644 index 0000000..e70fa13 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/player2.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/player3.png b/cpgames/core/games/bloodfootball/resources/images/player3.png new file mode 100644 index 0000000..641a0b8 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/player3.png differ diff --git a/cpgames/core/games/bloodfootball/resources/images/player4.png b/cpgames/core/games/bloodfootball/resources/images/player4.png new file mode 100644 index 0000000..b814c17 Binary files /dev/null and b/cpgames/core/games/bloodfootball/resources/images/player4.png differ diff --git a/cpgames/modules/core/bomberman/__init__.py b/cpgames/core/games/bomberman/__init__.py similarity index 100% rename from cpgames/modules/core/bomberman/__init__.py rename to cpgames/core/games/bomberman/__init__.py diff --git a/cpgames/modules/core/bomberman/bomberman.py b/cpgames/core/games/bomberman/bomberman.py similarity index 100% rename from cpgames/modules/core/bomberman/bomberman.py rename to cpgames/core/games/bomberman/bomberman.py diff --git a/cpgames/modules/core/bomberman/modules/__init__.py b/cpgames/core/games/bomberman/modules/__init__.py similarity index 100% rename from cpgames/modules/core/bomberman/modules/__init__.py rename to cpgames/core/games/bomberman/modules/__init__.py diff --git a/cpgames/modules/core/bomberman/modules/map.py b/cpgames/core/games/bomberman/modules/map.py similarity index 100% rename from cpgames/modules/core/bomberman/modules/map.py rename to cpgames/core/games/bomberman/modules/map.py diff --git a/cpgames/modules/core/bomberman/modules/misc.py b/cpgames/core/games/bomberman/modules/misc.py similarity index 100% rename from cpgames/modules/core/bomberman/modules/misc.py rename to cpgames/core/games/bomberman/modules/misc.py diff --git a/cpgames/modules/core/bomberman/modules/sprites.py b/cpgames/core/games/bomberman/modules/sprites.py similarity index 100% rename from cpgames/modules/core/bomberman/modules/sprites.py rename to cpgames/core/games/bomberman/modules/sprites.py diff --git a/cpgames/modules/core/bomberman/resources/audios/bgm.mp3 b/cpgames/core/games/bomberman/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/bomberman/resources/audios/bgm.mp3 rename to cpgames/core/games/bomberman/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/bomberman/resources/images/batman/down.png b/cpgames/core/games/bomberman/resources/images/batman/down.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/batman/down.png rename to cpgames/core/games/bomberman/resources/images/batman/down.png diff --git a/cpgames/modules/core/bomberman/resources/images/batman/left.png b/cpgames/core/games/bomberman/resources/images/batman/left.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/batman/left.png rename to cpgames/core/games/bomberman/resources/images/batman/left.png diff --git a/cpgames/modules/core/bomberman/resources/images/batman/right.png b/cpgames/core/games/bomberman/resources/images/batman/right.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/batman/right.png rename to cpgames/core/games/bomberman/resources/images/batman/right.png diff --git a/cpgames/modules/core/bomberman/resources/images/batman/up.png b/cpgames/core/games/bomberman/resources/images/batman/up.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/batman/up.png rename to cpgames/core/games/bomberman/resources/images/batman/up.png diff --git a/cpgames/modules/core/bomberman/resources/images/dk/down.png b/cpgames/core/games/bomberman/resources/images/dk/down.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/dk/down.png rename to cpgames/core/games/bomberman/resources/images/dk/down.png diff --git a/cpgames/modules/core/bomberman/resources/images/dk/left.png b/cpgames/core/games/bomberman/resources/images/dk/left.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/dk/left.png rename to cpgames/core/games/bomberman/resources/images/dk/left.png diff --git a/cpgames/modules/core/bomberman/resources/images/dk/right.png b/cpgames/core/games/bomberman/resources/images/dk/right.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/dk/right.png rename to cpgames/core/games/bomberman/resources/images/dk/right.png diff --git a/cpgames/modules/core/bomberman/resources/images/dk/up.png b/cpgames/core/games/bomberman/resources/images/dk/up.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/dk/up.png rename to cpgames/core/games/bomberman/resources/images/dk/up.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/banana.png b/cpgames/core/games/bomberman/resources/images/misc/banana.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/banana.png rename to cpgames/core/games/bomberman/resources/images/misc/banana.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/bg0.png b/cpgames/core/games/bomberman/resources/images/misc/bg0.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/bg0.png rename to cpgames/core/games/bomberman/resources/images/misc/bg0.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/bg1.png b/cpgames/core/games/bomberman/resources/images/misc/bg1.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/bg1.png rename to cpgames/core/games/bomberman/resources/images/misc/bg1.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/bg2.png b/cpgames/core/games/bomberman/resources/images/misc/bg2.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/bg2.png rename to cpgames/core/games/bomberman/resources/images/misc/bg2.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/blank.png b/cpgames/core/games/bomberman/resources/images/misc/blank.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/blank.png rename to cpgames/core/games/bomberman/resources/images/misc/blank.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/bomb.png b/cpgames/core/games/bomberman/resources/images/misc/bomb.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/bomb.png rename to cpgames/core/games/bomberman/resources/images/misc/bomb.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/cherry.png b/cpgames/core/games/bomberman/resources/images/misc/cherry.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/cherry.png rename to cpgames/core/games/bomberman/resources/images/misc/cherry.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/fire.png b/cpgames/core/games/bomberman/resources/images/misc/fire.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/fire.png rename to cpgames/core/games/bomberman/resources/images/misc/fire.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/start.png b/cpgames/core/games/bomberman/resources/images/misc/start.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/start.png rename to cpgames/core/games/bomberman/resources/images/misc/start.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/wall0.png b/cpgames/core/games/bomberman/resources/images/misc/wall0.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/wall0.png rename to cpgames/core/games/bomberman/resources/images/misc/wall0.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/wall1.png b/cpgames/core/games/bomberman/resources/images/misc/wall1.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/wall1.png rename to cpgames/core/games/bomberman/resources/images/misc/wall1.png diff --git a/cpgames/modules/core/bomberman/resources/images/misc/wall2.png b/cpgames/core/games/bomberman/resources/images/misc/wall2.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/misc/wall2.png rename to cpgames/core/games/bomberman/resources/images/misc/wall2.png diff --git a/cpgames/modules/core/bomberman/resources/images/zelda/down.png b/cpgames/core/games/bomberman/resources/images/zelda/down.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/zelda/down.png rename to cpgames/core/games/bomberman/resources/images/zelda/down.png diff --git a/cpgames/modules/core/bomberman/resources/images/zelda/left.png b/cpgames/core/games/bomberman/resources/images/zelda/left.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/zelda/left.png rename to cpgames/core/games/bomberman/resources/images/zelda/left.png diff --git a/cpgames/modules/core/bomberman/resources/images/zelda/right.png b/cpgames/core/games/bomberman/resources/images/zelda/right.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/zelda/right.png rename to cpgames/core/games/bomberman/resources/images/zelda/right.png diff --git a/cpgames/modules/core/bomberman/resources/images/zelda/up.png b/cpgames/core/games/bomberman/resources/images/zelda/up.png similarity index 100% rename from cpgames/modules/core/bomberman/resources/images/zelda/up.png rename to cpgames/core/games/bomberman/resources/images/zelda/up.png diff --git a/cpgames/modules/core/bomberman/resources/maps/1.map b/cpgames/core/games/bomberman/resources/maps/1.map similarity index 100% rename from cpgames/modules/core/bomberman/resources/maps/1.map rename to cpgames/core/games/bomberman/resources/maps/1.map diff --git a/cpgames/modules/core/bomberman/resources/maps/2.map b/cpgames/core/games/bomberman/resources/maps/2.map similarity index 100% rename from cpgames/modules/core/bomberman/resources/maps/2.map rename to cpgames/core/games/bomberman/resources/maps/2.map diff --git a/cpgames/modules/core/breakoutclone/__init__.py b/cpgames/core/games/breakoutclone/__init__.py similarity index 100% rename from cpgames/modules/core/breakoutclone/__init__.py rename to cpgames/core/games/breakoutclone/__init__.py diff --git a/cpgames/modules/core/breakoutclone/breakoutclone.py b/cpgames/core/games/breakoutclone/breakoutclone.py similarity index 100% rename from cpgames/modules/core/breakoutclone/breakoutclone.py rename to cpgames/core/games/breakoutclone/breakoutclone.py diff --git a/cpgames/modules/core/breakoutclone/modules/__init__.py b/cpgames/core/games/breakoutclone/modules/__init__.py similarity index 100% rename from cpgames/modules/core/breakoutclone/modules/__init__.py rename to cpgames/core/games/breakoutclone/modules/__init__.py diff --git a/cpgames/modules/core/breakoutclone/modules/sprites.py b/cpgames/core/games/breakoutclone/modules/sprites.py similarity index 100% rename from cpgames/modules/core/breakoutclone/modules/sprites.py rename to cpgames/core/games/breakoutclone/modules/sprites.py diff --git a/cpgames/modules/core/breakoutclone/modules/utils.py b/cpgames/core/games/breakoutclone/modules/utils.py similarity index 100% rename from cpgames/modules/core/breakoutclone/modules/utils.py rename to cpgames/core/games/breakoutclone/modules/utils.py diff --git a/cpgames/modules/core/breakoutclone/resources/audios/bgm.mp3 b/cpgames/core/games/breakoutclone/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/breakoutclone/resources/audios/bgm.mp3 rename to cpgames/core/games/breakoutclone/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/breakoutclone/resources/audios/hit.wav b/cpgames/core/games/breakoutclone/resources/audios/hit.wav similarity index 100% rename from cpgames/modules/core/breakoutclone/resources/audios/hit.wav rename to cpgames/core/games/breakoutclone/resources/audios/hit.wav diff --git a/cpgames/modules/core/breakoutclone/resources/levels/1.level b/cpgames/core/games/breakoutclone/resources/levels/1.level similarity index 100% rename from cpgames/modules/core/breakoutclone/resources/levels/1.level rename to cpgames/core/games/breakoutclone/resources/levels/1.level diff --git a/cpgames/modules/core/breakoutclone/resources/levels/2.level b/cpgames/core/games/breakoutclone/resources/levels/2.level similarity index 100% rename from cpgames/modules/core/breakoutclone/resources/levels/2.level rename to cpgames/core/games/breakoutclone/resources/levels/2.level diff --git a/cpgames/modules/core/breakoutclone/resources/levels/3.level b/cpgames/core/games/breakoutclone/resources/levels/3.level similarity index 100% rename from cpgames/modules/core/breakoutclone/resources/levels/3.level rename to cpgames/core/games/breakoutclone/resources/levels/3.level diff --git a/cpgames/modules/core/bunnybadger/__init__.py b/cpgames/core/games/bunnybadger/__init__.py similarity index 100% rename from cpgames/modules/core/bunnybadger/__init__.py rename to cpgames/core/games/bunnybadger/__init__.py diff --git a/cpgames/modules/core/bunnybadger/bunnybadger.py b/cpgames/core/games/bunnybadger/bunnybadger.py similarity index 100% rename from cpgames/modules/core/bunnybadger/bunnybadger.py rename to cpgames/core/games/bunnybadger/bunnybadger.py diff --git a/cpgames/modules/core/bunnybadger/modules/__init__.py b/cpgames/core/games/bunnybadger/modules/__init__.py similarity index 100% rename from cpgames/modules/core/bunnybadger/modules/__init__.py rename to cpgames/core/games/bunnybadger/modules/__init__.py diff --git a/cpgames/modules/core/bunnybadger/modules/interfaces.py b/cpgames/core/games/bunnybadger/modules/interfaces.py similarity index 100% rename from cpgames/modules/core/bunnybadger/modules/interfaces.py rename to cpgames/core/games/bunnybadger/modules/interfaces.py diff --git a/cpgames/modules/core/bunnybadger/modules/sprites.py b/cpgames/core/games/bunnybadger/modules/sprites.py similarity index 100% rename from cpgames/modules/core/bunnybadger/modules/sprites.py rename to cpgames/core/games/bunnybadger/modules/sprites.py diff --git a/cpgames/modules/core/bunnybadger/resources/audios/enemy.wav b/cpgames/core/games/bunnybadger/resources/audios/enemy.wav similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/audios/enemy.wav rename to cpgames/core/games/bunnybadger/resources/audios/enemy.wav diff --git a/cpgames/modules/core/bunnybadger/resources/audios/explode.wav b/cpgames/core/games/bunnybadger/resources/audios/explode.wav similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/audios/explode.wav rename to cpgames/core/games/bunnybadger/resources/audios/explode.wav diff --git a/cpgames/modules/core/bunnybadger/resources/audios/moonlight.wav b/cpgames/core/games/bunnybadger/resources/audios/moonlight.wav similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/audios/moonlight.wav rename to cpgames/core/games/bunnybadger/resources/audios/moonlight.wav diff --git a/cpgames/modules/core/bunnybadger/resources/audios/shoot.wav b/cpgames/core/games/bunnybadger/resources/audios/shoot.wav similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/audios/shoot.wav rename to cpgames/core/games/bunnybadger/resources/audios/shoot.wav diff --git a/cpgames/modules/core/bunnybadger/resources/images/._bullet.png b/cpgames/core/games/bunnybadger/resources/images/._bullet.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._bullet.png rename to cpgames/core/games/bunnybadger/resources/images/._bullet.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/._gameover.png b/cpgames/core/games/bunnybadger/resources/images/._gameover.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._gameover.png rename to cpgames/core/games/bunnybadger/resources/images/._gameover.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/._grass.png b/cpgames/core/games/bunnybadger/resources/images/._grass.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._grass.png rename to cpgames/core/games/bunnybadger/resources/images/._grass.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/._health.png b/cpgames/core/games/bunnybadger/resources/images/._health.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._health.png rename to cpgames/core/games/bunnybadger/resources/images/._health.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/._healthbar.png b/cpgames/core/games/bunnybadger/resources/images/._healthbar.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._healthbar.png rename to cpgames/core/games/bunnybadger/resources/images/._healthbar.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/._youwin.png b/cpgames/core/games/bunnybadger/resources/images/._youwin.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/._youwin.png rename to cpgames/core/games/bunnybadger/resources/images/._youwin.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/badguy.png b/cpgames/core/games/bunnybadger/resources/images/badguy.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/badguy.png rename to cpgames/core/games/bunnybadger/resources/images/badguy.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/badguy2.png b/cpgames/core/games/bunnybadger/resources/images/badguy2.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/badguy2.png rename to cpgames/core/games/bunnybadger/resources/images/badguy2.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/badguy3.png b/cpgames/core/games/bunnybadger/resources/images/badguy3.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/badguy3.png rename to cpgames/core/games/bunnybadger/resources/images/badguy3.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/badguy4.png b/cpgames/core/games/bunnybadger/resources/images/badguy4.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/badguy4.png rename to cpgames/core/games/bunnybadger/resources/images/badguy4.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/bullet.png b/cpgames/core/games/bunnybadger/resources/images/bullet.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/bullet.png rename to cpgames/core/games/bunnybadger/resources/images/bullet.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/castle.png b/cpgames/core/games/bunnybadger/resources/images/castle.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/castle.png rename to cpgames/core/games/bunnybadger/resources/images/castle.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/dude.png b/cpgames/core/games/bunnybadger/resources/images/dude.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/dude.png rename to cpgames/core/games/bunnybadger/resources/images/dude.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/dude2.png b/cpgames/core/games/bunnybadger/resources/images/dude2.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/dude2.png rename to cpgames/core/games/bunnybadger/resources/images/dude2.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/gameover.png b/cpgames/core/games/bunnybadger/resources/images/gameover.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/gameover.png rename to cpgames/core/games/bunnybadger/resources/images/gameover.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/grass.png b/cpgames/core/games/bunnybadger/resources/images/grass.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/grass.png rename to cpgames/core/games/bunnybadger/resources/images/grass.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/health.png b/cpgames/core/games/bunnybadger/resources/images/health.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/health.png rename to cpgames/core/games/bunnybadger/resources/images/health.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/healthbar.png b/cpgames/core/games/bunnybadger/resources/images/healthbar.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/healthbar.png rename to cpgames/core/games/bunnybadger/resources/images/healthbar.png diff --git a/cpgames/modules/core/bunnybadger/resources/images/youwin.png b/cpgames/core/games/bunnybadger/resources/images/youwin.png similarity index 100% rename from cpgames/modules/core/bunnybadger/resources/images/youwin.png rename to cpgames/core/games/bunnybadger/resources/images/youwin.png diff --git a/cpgames/modules/core/catchcoins/__init__.py b/cpgames/core/games/catchcoins/__init__.py similarity index 100% rename from cpgames/modules/core/catchcoins/__init__.py rename to cpgames/core/games/catchcoins/__init__.py diff --git a/cpgames/modules/core/catchcoins/catchcoins.py b/cpgames/core/games/catchcoins/catchcoins.py similarity index 100% rename from cpgames/modules/core/catchcoins/catchcoins.py rename to cpgames/core/games/catchcoins/catchcoins.py diff --git a/cpgames/modules/core/catchcoins/highest.rec b/cpgames/core/games/catchcoins/highest.rec similarity index 100% rename from cpgames/modules/core/catchcoins/highest.rec rename to cpgames/core/games/catchcoins/highest.rec diff --git a/cpgames/modules/core/catchcoins/modules/__init__.py b/cpgames/core/games/catchcoins/modules/__init__.py similarity index 100% rename from cpgames/modules/core/catchcoins/modules/__init__.py rename to cpgames/core/games/catchcoins/modules/__init__.py diff --git a/cpgames/modules/core/catchcoins/modules/endinterface.py b/cpgames/core/games/catchcoins/modules/endinterface.py similarity index 100% rename from cpgames/modules/core/catchcoins/modules/endinterface.py rename to cpgames/core/games/catchcoins/modules/endinterface.py diff --git a/cpgames/modules/core/catchcoins/modules/food.py b/cpgames/core/games/catchcoins/modules/food.py similarity index 100% rename from cpgames/modules/core/catchcoins/modules/food.py rename to cpgames/core/games/catchcoins/modules/food.py diff --git a/cpgames/modules/core/catchcoins/modules/hero.py b/cpgames/core/games/catchcoins/modules/hero.py similarity index 100% rename from cpgames/modules/core/catchcoins/modules/hero.py rename to cpgames/core/games/catchcoins/modules/hero.py diff --git a/cpgames/modules/core/catchcoins/resources/audios/bgm.mp3 b/cpgames/core/games/catchcoins/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/catchcoins/resources/audios/bgm.mp3 rename to cpgames/core/games/catchcoins/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/catchcoins/resources/audios/get.wav b/cpgames/core/games/catchcoins/resources/audios/get.wav similarity index 100% rename from cpgames/modules/core/catchcoins/resources/audios/get.wav rename to cpgames/core/games/catchcoins/resources/audios/get.wav diff --git a/cpgames/modules/core/catchcoins/resources/images/1.png b/cpgames/core/games/catchcoins/resources/images/1.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/1.png rename to cpgames/core/games/catchcoins/resources/images/1.png diff --git a/cpgames/modules/core/catchcoins/resources/images/10.png b/cpgames/core/games/catchcoins/resources/images/10.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/10.png rename to cpgames/core/games/catchcoins/resources/images/10.png diff --git a/cpgames/modules/core/catchcoins/resources/images/2.png b/cpgames/core/games/catchcoins/resources/images/2.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/2.png rename to cpgames/core/games/catchcoins/resources/images/2.png diff --git a/cpgames/modules/core/catchcoins/resources/images/3.png b/cpgames/core/games/catchcoins/resources/images/3.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/3.png rename to cpgames/core/games/catchcoins/resources/images/3.png diff --git a/cpgames/modules/core/catchcoins/resources/images/4.png b/cpgames/core/games/catchcoins/resources/images/4.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/4.png rename to cpgames/core/games/catchcoins/resources/images/4.png diff --git a/cpgames/modules/core/catchcoins/resources/images/5.png b/cpgames/core/games/catchcoins/resources/images/5.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/5.png rename to cpgames/core/games/catchcoins/resources/images/5.png diff --git a/cpgames/modules/core/catchcoins/resources/images/6.png b/cpgames/core/games/catchcoins/resources/images/6.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/6.png rename to cpgames/core/games/catchcoins/resources/images/6.png diff --git a/cpgames/modules/core/catchcoins/resources/images/7.png b/cpgames/core/games/catchcoins/resources/images/7.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/7.png rename to cpgames/core/games/catchcoins/resources/images/7.png diff --git a/cpgames/modules/core/catchcoins/resources/images/8.png b/cpgames/core/games/catchcoins/resources/images/8.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/8.png rename to cpgames/core/games/catchcoins/resources/images/8.png diff --git a/cpgames/modules/core/catchcoins/resources/images/9.png b/cpgames/core/games/catchcoins/resources/images/9.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/9.png rename to cpgames/core/games/catchcoins/resources/images/9.png diff --git a/cpgames/modules/core/catchcoins/resources/images/apple.png b/cpgames/core/games/catchcoins/resources/images/apple.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/apple.png rename to cpgames/core/games/catchcoins/resources/images/apple.png diff --git a/cpgames/modules/core/catchcoins/resources/images/background.jpg b/cpgames/core/games/catchcoins/resources/images/background.jpg similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/background.jpg rename to cpgames/core/games/catchcoins/resources/images/background.jpg diff --git a/cpgames/modules/core/catchcoins/resources/images/gold.png b/cpgames/core/games/catchcoins/resources/images/gold.png similarity index 100% rename from cpgames/modules/core/catchcoins/resources/images/gold.png rename to cpgames/core/games/catchcoins/resources/images/gold.png diff --git a/cpgames/modules/core/flappybird/__init__.py b/cpgames/core/games/flappybird/__init__.py similarity index 100% rename from cpgames/modules/core/flappybird/__init__.py rename to cpgames/core/games/flappybird/__init__.py diff --git a/cpgames/modules/core/flappybird/flappybird.py b/cpgames/core/games/flappybird/flappybird.py similarity index 100% rename from cpgames/modules/core/flappybird/flappybird.py rename to cpgames/core/games/flappybird/flappybird.py diff --git a/cpgames/modules/core/flappybird/modules/__init__.py b/cpgames/core/games/flappybird/modules/__init__.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/__init__.py rename to cpgames/core/games/flappybird/modules/__init__.py diff --git a/cpgames/modules/core/flappybird/modules/interfaces/__init__.py b/cpgames/core/games/flappybird/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/interfaces/__init__.py rename to cpgames/core/games/flappybird/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/flappybird/modules/interfaces/endinterface.py b/cpgames/core/games/flappybird/modules/interfaces/endinterface.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/interfaces/endinterface.py rename to cpgames/core/games/flappybird/modules/interfaces/endinterface.py diff --git a/cpgames/modules/core/flappybird/modules/interfaces/startinterface.py b/cpgames/core/games/flappybird/modules/interfaces/startinterface.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/interfaces/startinterface.py rename to cpgames/core/games/flappybird/modules/interfaces/startinterface.py diff --git a/cpgames/modules/core/flappybird/modules/sprites/__init__.py b/cpgames/core/games/flappybird/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/sprites/__init__.py rename to cpgames/core/games/flappybird/modules/sprites/__init__.py diff --git a/cpgames/modules/core/flappybird/modules/sprites/bird.py b/cpgames/core/games/flappybird/modules/sprites/bird.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/sprites/bird.py rename to cpgames/core/games/flappybird/modules/sprites/bird.py diff --git a/cpgames/modules/core/flappybird/modules/sprites/pipe.py b/cpgames/core/games/flappybird/modules/sprites/pipe.py similarity index 100% rename from cpgames/modules/core/flappybird/modules/sprites/pipe.py rename to cpgames/core/games/flappybird/modules/sprites/pipe.py diff --git a/cpgames/modules/core/flappybird/resources/audios/die.ogg b/cpgames/core/games/flappybird/resources/audios/die.ogg similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/die.ogg rename to cpgames/core/games/flappybird/resources/audios/die.ogg diff --git a/cpgames/modules/core/flappybird/resources/audios/die.wav b/cpgames/core/games/flappybird/resources/audios/die.wav similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/die.wav rename to cpgames/core/games/flappybird/resources/audios/die.wav diff --git a/cpgames/modules/core/flappybird/resources/audios/hit.ogg b/cpgames/core/games/flappybird/resources/audios/hit.ogg similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/hit.ogg rename to cpgames/core/games/flappybird/resources/audios/hit.ogg diff --git a/cpgames/modules/core/flappybird/resources/audios/hit.wav b/cpgames/core/games/flappybird/resources/audios/hit.wav similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/hit.wav rename to cpgames/core/games/flappybird/resources/audios/hit.wav diff --git a/cpgames/modules/core/flappybird/resources/audios/point.ogg b/cpgames/core/games/flappybird/resources/audios/point.ogg similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/point.ogg rename to cpgames/core/games/flappybird/resources/audios/point.ogg diff --git a/cpgames/modules/core/flappybird/resources/audios/point.wav b/cpgames/core/games/flappybird/resources/audios/point.wav similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/point.wav rename to cpgames/core/games/flappybird/resources/audios/point.wav diff --git a/cpgames/modules/core/flappybird/resources/audios/swoosh.ogg b/cpgames/core/games/flappybird/resources/audios/swoosh.ogg similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/swoosh.ogg rename to cpgames/core/games/flappybird/resources/audios/swoosh.ogg diff --git a/cpgames/modules/core/flappybird/resources/audios/swoosh.wav b/cpgames/core/games/flappybird/resources/audios/swoosh.wav similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/swoosh.wav rename to cpgames/core/games/flappybird/resources/audios/swoosh.wav diff --git a/cpgames/modules/core/flappybird/resources/audios/wing.ogg b/cpgames/core/games/flappybird/resources/audios/wing.ogg similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/wing.ogg rename to cpgames/core/games/flappybird/resources/audios/wing.ogg diff --git a/cpgames/modules/core/flappybird/resources/audios/wing.wav b/cpgames/core/games/flappybird/resources/audios/wing.wav similarity index 100% rename from cpgames/modules/core/flappybird/resources/audios/wing.wav rename to cpgames/core/games/flappybird/resources/audios/wing.wav diff --git a/cpgames/modules/core/flappybird/resources/images/0.png b/cpgames/core/games/flappybird/resources/images/0.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/0.png rename to cpgames/core/games/flappybird/resources/images/0.png diff --git a/cpgames/modules/core/flappybird/resources/images/1.png b/cpgames/core/games/flappybird/resources/images/1.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/1.png rename to cpgames/core/games/flappybird/resources/images/1.png diff --git a/cpgames/modules/core/flappybird/resources/images/2.png b/cpgames/core/games/flappybird/resources/images/2.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/2.png rename to cpgames/core/games/flappybird/resources/images/2.png diff --git a/cpgames/modules/core/flappybird/resources/images/3.png b/cpgames/core/games/flappybird/resources/images/3.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/3.png rename to cpgames/core/games/flappybird/resources/images/3.png diff --git a/cpgames/modules/core/flappybird/resources/images/4.png b/cpgames/core/games/flappybird/resources/images/4.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/4.png rename to cpgames/core/games/flappybird/resources/images/4.png diff --git a/cpgames/modules/core/flappybird/resources/images/5.png b/cpgames/core/games/flappybird/resources/images/5.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/5.png rename to cpgames/core/games/flappybird/resources/images/5.png diff --git a/cpgames/modules/core/flappybird/resources/images/6.png b/cpgames/core/games/flappybird/resources/images/6.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/6.png rename to cpgames/core/games/flappybird/resources/images/6.png diff --git a/cpgames/modules/core/flappybird/resources/images/7.png b/cpgames/core/games/flappybird/resources/images/7.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/7.png rename to cpgames/core/games/flappybird/resources/images/7.png diff --git a/cpgames/modules/core/flappybird/resources/images/8.png b/cpgames/core/games/flappybird/resources/images/8.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/8.png rename to cpgames/core/games/flappybird/resources/images/8.png diff --git a/cpgames/modules/core/flappybird/resources/images/9.png b/cpgames/core/games/flappybird/resources/images/9.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/9.png rename to cpgames/core/games/flappybird/resources/images/9.png diff --git a/cpgames/modules/core/flappybird/resources/images/background-day.png b/cpgames/core/games/flappybird/resources/images/background-day.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/background-day.png rename to cpgames/core/games/flappybird/resources/images/background-day.png diff --git a/cpgames/modules/core/flappybird/resources/images/background-night.png b/cpgames/core/games/flappybird/resources/images/background-night.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/background-night.png rename to cpgames/core/games/flappybird/resources/images/background-night.png diff --git a/cpgames/modules/core/flappybird/resources/images/base.png b/cpgames/core/games/flappybird/resources/images/base.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/base.png rename to cpgames/core/games/flappybird/resources/images/base.png diff --git a/cpgames/modules/core/flappybird/resources/images/bluebird-downflap.png b/cpgames/core/games/flappybird/resources/images/bluebird-downflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/bluebird-downflap.png rename to cpgames/core/games/flappybird/resources/images/bluebird-downflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/bluebird-midflap.png b/cpgames/core/games/flappybird/resources/images/bluebird-midflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/bluebird-midflap.png rename to cpgames/core/games/flappybird/resources/images/bluebird-midflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/bluebird-upflap.png b/cpgames/core/games/flappybird/resources/images/bluebird-upflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/bluebird-upflap.png rename to cpgames/core/games/flappybird/resources/images/bluebird-upflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/flappy.ico b/cpgames/core/games/flappybird/resources/images/flappy.ico similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/flappy.ico rename to cpgames/core/games/flappybird/resources/images/flappy.ico diff --git a/cpgames/modules/core/flappybird/resources/images/gameover.png b/cpgames/core/games/flappybird/resources/images/gameover.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/gameover.png rename to cpgames/core/games/flappybird/resources/images/gameover.png diff --git a/cpgames/modules/core/flappybird/resources/images/message.png b/cpgames/core/games/flappybird/resources/images/message.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/message.png rename to cpgames/core/games/flappybird/resources/images/message.png diff --git a/cpgames/modules/core/flappybird/resources/images/pipe-green.png b/cpgames/core/games/flappybird/resources/images/pipe-green.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/pipe-green.png rename to cpgames/core/games/flappybird/resources/images/pipe-green.png diff --git a/cpgames/modules/core/flappybird/resources/images/pipe-red.png b/cpgames/core/games/flappybird/resources/images/pipe-red.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/pipe-red.png rename to cpgames/core/games/flappybird/resources/images/pipe-red.png diff --git a/cpgames/modules/core/flappybird/resources/images/redbird-downflap.png b/cpgames/core/games/flappybird/resources/images/redbird-downflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/redbird-downflap.png rename to cpgames/core/games/flappybird/resources/images/redbird-downflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/redbird-midflap.png b/cpgames/core/games/flappybird/resources/images/redbird-midflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/redbird-midflap.png rename to cpgames/core/games/flappybird/resources/images/redbird-midflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/redbird-upflap.png b/cpgames/core/games/flappybird/resources/images/redbird-upflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/redbird-upflap.png rename to cpgames/core/games/flappybird/resources/images/redbird-upflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/yellowbird-downflap.png b/cpgames/core/games/flappybird/resources/images/yellowbird-downflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/yellowbird-downflap.png rename to cpgames/core/games/flappybird/resources/images/yellowbird-downflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/yellowbird-midflap.png b/cpgames/core/games/flappybird/resources/images/yellowbird-midflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/yellowbird-midflap.png rename to cpgames/core/games/flappybird/resources/images/yellowbird-midflap.png diff --git a/cpgames/modules/core/flappybird/resources/images/yellowbird-upflap.png b/cpgames/core/games/flappybird/resources/images/yellowbird-upflap.png similarity index 100% rename from cpgames/modules/core/flappybird/resources/images/yellowbird-upflap.png rename to cpgames/core/games/flappybird/resources/images/yellowbird-upflap.png diff --git a/cpgames/modules/core/flipcardbymemory/__init__.py b/cpgames/core/games/flipcardbymemory/__init__.py similarity index 100% rename from cpgames/modules/core/flipcardbymemory/__init__.py rename to cpgames/core/games/flipcardbymemory/__init__.py diff --git a/cpgames/modules/core/flipcardbymemory/flipcardbymemory.py b/cpgames/core/games/flipcardbymemory/flipcardbymemory.py similarity index 100% rename from cpgames/modules/core/flipcardbymemory/flipcardbymemory.py rename to cpgames/core/games/flipcardbymemory/flipcardbymemory.py diff --git a/cpgames/modules/core/flipcardbymemory/resources/audios/bgm.mp3 b/cpgames/core/games/flipcardbymemory/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/audios/bgm.mp3 rename to cpgames/core/games/flipcardbymemory/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/flipcardbymemory/resources/audios/score.wav b/cpgames/core/games/flipcardbymemory/resources/audios/score.wav similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/audios/score.wav rename to cpgames/core/games/flipcardbymemory/resources/audios/score.wav diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/0.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/0.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/0.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/0.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/1.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/1.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/1.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/1.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/2.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/2.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/2.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/2.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/3.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/3.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/3.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/3.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/4.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/4.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/4.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/4.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/5.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/5.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/5.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/5.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/6.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/6.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/6.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/6.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series1/7.png b/cpgames/core/games/flipcardbymemory/resources/images/series1/7.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series1/7.png rename to cpgames/core/games/flipcardbymemory/resources/images/series1/7.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/0.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/0.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/0.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/0.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/1.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/1.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/1.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/1.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/2.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/2.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/2.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/2.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/3.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/3.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/3.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/3.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/4.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/4.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/4.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/4.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/5.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/5.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/5.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/5.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/6.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/6.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/6.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/6.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series2/7.png b/cpgames/core/games/flipcardbymemory/resources/images/series2/7.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series2/7.png rename to cpgames/core/games/flipcardbymemory/resources/images/series2/7.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/0.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/0.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/0.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/0.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/1.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/1.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/1.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/1.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/2.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/2.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/2.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/2.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/3.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/3.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/3.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/3.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/4.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/4.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/4.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/4.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/5.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/5.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/5.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/5.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/6.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/6.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/6.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/6.png diff --git a/cpgames/modules/core/flipcardbymemory/resources/images/series3/7.png b/cpgames/core/games/flipcardbymemory/resources/images/series3/7.png similarity index 100% rename from cpgames/modules/core/flipcardbymemory/resources/images/series3/7.png rename to cpgames/core/games/flipcardbymemory/resources/images/series3/7.png diff --git a/cpgames/modules/core/gemgem/__init__.py b/cpgames/core/games/gemgem/__init__.py similarity index 100% rename from cpgames/modules/core/gemgem/__init__.py rename to cpgames/core/games/gemgem/__init__.py diff --git a/cpgames/modules/core/gemgem/gemgem.py b/cpgames/core/games/gemgem/gemgem.py similarity index 100% rename from cpgames/modules/core/gemgem/gemgem.py rename to cpgames/core/games/gemgem/gemgem.py diff --git a/cpgames/modules/core/gemgem/modules/__init__.py b/cpgames/core/games/gemgem/modules/__init__.py similarity index 100% rename from cpgames/modules/core/gemgem/modules/__init__.py rename to cpgames/core/games/gemgem/modules/__init__.py diff --git a/cpgames/modules/core/gemgem/modules/game.py b/cpgames/core/games/gemgem/modules/game.py similarity index 100% rename from cpgames/modules/core/gemgem/modules/game.py rename to cpgames/core/games/gemgem/modules/game.py diff --git a/cpgames/modules/core/gemgem/resources/audios/badswap.wav b/cpgames/core/games/gemgem/resources/audios/badswap.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/badswap.wav rename to cpgames/core/games/gemgem/resources/audios/badswap.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/bg.mp3 b/cpgames/core/games/gemgem/resources/audios/bg.mp3 similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/bg.mp3 rename to cpgames/core/games/gemgem/resources/audios/bg.mp3 diff --git a/cpgames/modules/core/gemgem/resources/audios/match0.wav b/cpgames/core/games/gemgem/resources/audios/match0.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match0.wav rename to cpgames/core/games/gemgem/resources/audios/match0.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/match1.wav b/cpgames/core/games/gemgem/resources/audios/match1.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match1.wav rename to cpgames/core/games/gemgem/resources/audios/match1.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/match2.wav b/cpgames/core/games/gemgem/resources/audios/match2.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match2.wav rename to cpgames/core/games/gemgem/resources/audios/match2.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/match3.wav b/cpgames/core/games/gemgem/resources/audios/match3.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match3.wav rename to cpgames/core/games/gemgem/resources/audios/match3.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/match4.wav b/cpgames/core/games/gemgem/resources/audios/match4.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match4.wav rename to cpgames/core/games/gemgem/resources/audios/match4.wav diff --git a/cpgames/modules/core/gemgem/resources/audios/match5.wav b/cpgames/core/games/gemgem/resources/audios/match5.wav similarity index 100% rename from cpgames/modules/core/gemgem/resources/audios/match5.wav rename to cpgames/core/games/gemgem/resources/audios/match5.wav diff --git a/cpgames/modules/core/gemgem/resources/images/gem1.png b/cpgames/core/games/gemgem/resources/images/gem1.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem1.png rename to cpgames/core/games/gemgem/resources/images/gem1.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem2.png b/cpgames/core/games/gemgem/resources/images/gem2.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem2.png rename to cpgames/core/games/gemgem/resources/images/gem2.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem3.png b/cpgames/core/games/gemgem/resources/images/gem3.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem3.png rename to cpgames/core/games/gemgem/resources/images/gem3.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem4.png b/cpgames/core/games/gemgem/resources/images/gem4.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem4.png rename to cpgames/core/games/gemgem/resources/images/gem4.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem5.png b/cpgames/core/games/gemgem/resources/images/gem5.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem5.png rename to cpgames/core/games/gemgem/resources/images/gem5.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem6.png b/cpgames/core/games/gemgem/resources/images/gem6.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem6.png rename to cpgames/core/games/gemgem/resources/images/gem6.png diff --git a/cpgames/modules/core/gemgem/resources/images/gem7.png b/cpgames/core/games/gemgem/resources/images/gem7.png similarity index 100% rename from cpgames/modules/core/gemgem/resources/images/gem7.png rename to cpgames/core/games/gemgem/resources/images/gem7.png diff --git a/cpgames/modules/core/gobang/__init__.py b/cpgames/core/games/gobang/__init__.py similarity index 100% rename from cpgames/modules/core/gobang/__init__.py rename to cpgames/core/games/gobang/__init__.py diff --git a/cpgames/modules/core/gobang/gobang.py b/cpgames/core/games/gobang/gobang.py similarity index 100% rename from cpgames/modules/core/gobang/gobang.py rename to cpgames/core/games/gobang/gobang.py diff --git a/cpgames/modules/core/gobang/modules/__init__.py b/cpgames/core/games/gobang/modules/__init__.py similarity index 100% rename from cpgames/modules/core/gobang/modules/__init__.py rename to cpgames/core/games/gobang/modules/__init__.py diff --git a/cpgames/modules/core/gobang/modules/ai/__init__.py b/cpgames/core/games/gobang/modules/ai/__init__.py similarity index 100% rename from cpgames/modules/core/gobang/modules/ai/__init__.py rename to cpgames/core/games/gobang/modules/ai/__init__.py diff --git a/cpgames/modules/core/gobang/modules/ai/aigobang.py b/cpgames/core/games/gobang/modules/ai/aigobang.py similarity index 100% rename from cpgames/modules/core/gobang/modules/ai/aigobang.py rename to cpgames/core/games/gobang/modules/ai/aigobang.py diff --git a/cpgames/modules/core/gobang/modules/ai/playwithai.py b/cpgames/core/games/gobang/modules/ai/playwithai.py similarity index 100% rename from cpgames/modules/core/gobang/modules/ai/playwithai.py rename to cpgames/core/games/gobang/modules/ai/playwithai.py diff --git a/cpgames/modules/core/gobang/modules/misc/__init__.py b/cpgames/core/games/gobang/modules/misc/__init__.py similarity index 100% rename from cpgames/modules/core/gobang/modules/misc/__init__.py rename to cpgames/core/games/gobang/modules/misc/__init__.py diff --git a/cpgames/modules/core/gobang/modules/misc/buttons.py b/cpgames/core/games/gobang/modules/misc/buttons.py similarity index 100% rename from cpgames/modules/core/gobang/modules/misc/buttons.py rename to cpgames/core/games/gobang/modules/misc/buttons.py diff --git a/cpgames/modules/core/gobang/modules/misc/chessman.py b/cpgames/core/games/gobang/modules/misc/chessman.py similarity index 100% rename from cpgames/modules/core/gobang/modules/misc/chessman.py rename to cpgames/core/games/gobang/modules/misc/chessman.py diff --git a/cpgames/modules/core/gobang/modules/misc/utils.py b/cpgames/core/games/gobang/modules/misc/utils.py similarity index 100% rename from cpgames/modules/core/gobang/modules/misc/utils.py rename to cpgames/core/games/gobang/modules/misc/utils.py diff --git a/cpgames/modules/core/gobang/modules/online/__init__.py b/cpgames/core/games/gobang/modules/online/__init__.py similarity index 100% rename from cpgames/modules/core/gobang/modules/online/__init__.py rename to cpgames/core/games/gobang/modules/online/__init__.py diff --git a/cpgames/modules/core/gobang/modules/online/client.py b/cpgames/core/games/gobang/modules/online/client.py similarity index 100% rename from cpgames/modules/core/gobang/modules/online/client.py rename to cpgames/core/games/gobang/modules/online/client.py diff --git a/cpgames/modules/core/gobang/modules/online/playonline.py b/cpgames/core/games/gobang/modules/online/playonline.py similarity index 100% rename from cpgames/modules/core/gobang/modules/online/playonline.py rename to cpgames/core/games/gobang/modules/online/playonline.py diff --git a/cpgames/modules/core/gobang/modules/online/server.py b/cpgames/core/games/gobang/modules/online/server.py similarity index 100% rename from cpgames/modules/core/gobang/modules/online/server.py rename to cpgames/core/games/gobang/modules/online/server.py diff --git a/cpgames/modules/core/gobang/resources/audios/drop.wav b/cpgames/core/games/gobang/resources/audios/drop.wav similarity index 100% rename from cpgames/modules/core/gobang/resources/audios/drop.wav rename to cpgames/core/games/gobang/resources/audios/drop.wav diff --git a/cpgames/modules/core/gobang/resources/audios/urge.wav b/cpgames/core/games/gobang/resources/audios/urge.wav similarity index 100% rename from cpgames/modules/core/gobang/resources/audios/urge.wav rename to cpgames/core/games/gobang/resources/audios/urge.wav diff --git a/cpgames/modules/core/gobang/resources/images/bg/bg_game.png b/cpgames/core/games/gobang/resources/images/bg/bg_game.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/bg/bg_game.png rename to cpgames/core/games/gobang/resources/images/bg/bg_game.png diff --git a/cpgames/modules/core/gobang/resources/images/bg/bg_start.png b/cpgames/core/games/gobang/resources/images/bg/bg_start.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/bg/bg_start.png rename to cpgames/core/games/gobang/resources/images/bg/bg_start.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/ai_0.png b/cpgames/core/games/gobang/resources/images/buttons/ai_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/ai_0.png rename to cpgames/core/games/gobang/resources/images/buttons/ai_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/ai_1.png b/cpgames/core/games/gobang/resources/images/buttons/ai_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/ai_1.png rename to cpgames/core/games/gobang/resources/images/buttons/ai_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/ai_2.png b/cpgames/core/games/gobang/resources/images/buttons/ai_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/ai_2.png rename to cpgames/core/games/gobang/resources/images/buttons/ai_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/givein_0.png b/cpgames/core/games/gobang/resources/images/buttons/givein_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/givein_0.png rename to cpgames/core/games/gobang/resources/images/buttons/givein_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/givein_1.png b/cpgames/core/games/gobang/resources/images/buttons/givein_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/givein_1.png rename to cpgames/core/games/gobang/resources/images/buttons/givein_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/givein_2.png b/cpgames/core/games/gobang/resources/images/buttons/givein_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/givein_2.png rename to cpgames/core/games/gobang/resources/images/buttons/givein_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/home_0.png b/cpgames/core/games/gobang/resources/images/buttons/home_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/home_0.png rename to cpgames/core/games/gobang/resources/images/buttons/home_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/home_1.png b/cpgames/core/games/gobang/resources/images/buttons/home_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/home_1.png rename to cpgames/core/games/gobang/resources/images/buttons/home_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/home_2.png b/cpgames/core/games/gobang/resources/images/buttons/home_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/home_2.png rename to cpgames/core/games/gobang/resources/images/buttons/home_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/online_0.png b/cpgames/core/games/gobang/resources/images/buttons/online_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/online_0.png rename to cpgames/core/games/gobang/resources/images/buttons/online_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/online_1.png b/cpgames/core/games/gobang/resources/images/buttons/online_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/online_1.png rename to cpgames/core/games/gobang/resources/images/buttons/online_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/online_2.png b/cpgames/core/games/gobang/resources/images/buttons/online_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/online_2.png rename to cpgames/core/games/gobang/resources/images/buttons/online_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/regret_0.png b/cpgames/core/games/gobang/resources/images/buttons/regret_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/regret_0.png rename to cpgames/core/games/gobang/resources/images/buttons/regret_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/regret_1.png b/cpgames/core/games/gobang/resources/images/buttons/regret_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/regret_1.png rename to cpgames/core/games/gobang/resources/images/buttons/regret_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/regret_2.png b/cpgames/core/games/gobang/resources/images/buttons/regret_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/regret_2.png rename to cpgames/core/games/gobang/resources/images/buttons/regret_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/startgame_0.png b/cpgames/core/games/gobang/resources/images/buttons/startgame_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/startgame_0.png rename to cpgames/core/games/gobang/resources/images/buttons/startgame_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/startgame_1.png b/cpgames/core/games/gobang/resources/images/buttons/startgame_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/startgame_1.png rename to cpgames/core/games/gobang/resources/images/buttons/startgame_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/startgame_2.png b/cpgames/core/games/gobang/resources/images/buttons/startgame_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/startgame_2.png rename to cpgames/core/games/gobang/resources/images/buttons/startgame_2.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/urge_0.png b/cpgames/core/games/gobang/resources/images/buttons/urge_0.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/urge_0.png rename to cpgames/core/games/gobang/resources/images/buttons/urge_0.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/urge_1.png b/cpgames/core/games/gobang/resources/images/buttons/urge_1.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/urge_1.png rename to cpgames/core/games/gobang/resources/images/buttons/urge_1.png diff --git a/cpgames/modules/core/gobang/resources/images/buttons/urge_2.png b/cpgames/core/games/gobang/resources/images/buttons/urge_2.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/buttons/urge_2.png rename to cpgames/core/games/gobang/resources/images/buttons/urge_2.png diff --git a/cpgames/modules/core/gobang/resources/images/chessman/black.png b/cpgames/core/games/gobang/resources/images/chessman/black.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/chessman/black.png rename to cpgames/core/games/gobang/resources/images/chessman/black.png diff --git a/cpgames/modules/core/gobang/resources/images/chessman/sign.png b/cpgames/core/games/gobang/resources/images/chessman/sign.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/chessman/sign.png rename to cpgames/core/games/gobang/resources/images/chessman/sign.png diff --git a/cpgames/modules/core/gobang/resources/images/chessman/white.png b/cpgames/core/games/gobang/resources/images/chessman/white.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/chessman/white.png rename to cpgames/core/games/gobang/resources/images/chessman/white.png diff --git a/cpgames/modules/core/gobang/resources/images/icon/icon.ico b/cpgames/core/games/gobang/resources/images/icon/icon.ico similarity index 100% rename from cpgames/modules/core/gobang/resources/images/icon/icon.ico rename to cpgames/core/games/gobang/resources/images/icon/icon.ico diff --git a/cpgames/modules/core/gobang/resources/images/win/black_win.png b/cpgames/core/games/gobang/resources/images/win/black_win.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/win/black_win.png rename to cpgames/core/games/gobang/resources/images/win/black_win.png diff --git a/cpgames/modules/core/gobang/resources/images/win/draw.png b/cpgames/core/games/gobang/resources/images/win/draw.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/win/draw.png rename to cpgames/core/games/gobang/resources/images/win/draw.png diff --git a/cpgames/modules/core/gobang/resources/images/win/white_win.png b/cpgames/core/games/gobang/resources/images/win/white_win.png similarity index 100% rename from cpgames/modules/core/gobang/resources/images/win/white_win.png rename to cpgames/core/games/gobang/resources/images/win/white_win.png diff --git a/cpgames/modules/core/greedysnake/__init__.py b/cpgames/core/games/greedysnake/__init__.py similarity index 100% rename from cpgames/modules/core/greedysnake/__init__.py rename to cpgames/core/games/greedysnake/__init__.py diff --git a/cpgames/modules/core/greedysnake/greedysnake.py b/cpgames/core/games/greedysnake/greedysnake.py similarity index 100% rename from cpgames/modules/core/greedysnake/greedysnake.py rename to cpgames/core/games/greedysnake/greedysnake.py diff --git a/cpgames/modules/core/greedysnake/modules/__init__.py b/cpgames/core/games/greedysnake/modules/__init__.py similarity index 100% rename from cpgames/modules/core/greedysnake/modules/__init__.py rename to cpgames/core/games/greedysnake/modules/__init__.py diff --git a/cpgames/modules/core/greedysnake/modules/endinterface.py b/cpgames/core/games/greedysnake/modules/endinterface.py similarity index 100% rename from cpgames/modules/core/greedysnake/modules/endinterface.py rename to cpgames/core/games/greedysnake/modules/endinterface.py diff --git a/cpgames/modules/core/greedysnake/modules/food.py b/cpgames/core/games/greedysnake/modules/food.py similarity index 100% rename from cpgames/modules/core/greedysnake/modules/food.py rename to cpgames/core/games/greedysnake/modules/food.py diff --git a/cpgames/modules/core/greedysnake/modules/snake.py b/cpgames/core/games/greedysnake/modules/snake.py similarity index 100% rename from cpgames/modules/core/greedysnake/modules/snake.py rename to cpgames/core/games/greedysnake/modules/snake.py diff --git a/cpgames/modules/core/greedysnake/modules/utils.py b/cpgames/core/games/greedysnake/modules/utils.py similarity index 100% rename from cpgames/modules/core/greedysnake/modules/utils.py rename to cpgames/core/games/greedysnake/modules/utils.py diff --git a/cpgames/modules/core/greedysnake/resources/audios/bgm.mp3 b/cpgames/core/games/greedysnake/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/greedysnake/resources/audios/bgm.mp3 rename to cpgames/core/games/greedysnake/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/magictower/__init__.py b/cpgames/core/games/magictower/__init__.py similarity index 100% rename from cpgames/modules/core/magictower/__init__.py rename to cpgames/core/games/magictower/__init__.py diff --git a/cpgames/modules/core/magictower/magictower.py b/cpgames/core/games/magictower/magictower.py similarity index 100% rename from cpgames/modules/core/magictower/magictower.py rename to cpgames/core/games/magictower/magictower.py diff --git a/cpgames/modules/core/magictower/modules/__init__.py b/cpgames/core/games/magictower/modules/__init__.py similarity index 100% rename from cpgames/modules/core/magictower/modules/__init__.py rename to cpgames/core/games/magictower/modules/__init__.py diff --git a/cpgames/modules/core/magictower/modules/gamelevels.py b/cpgames/core/games/magictower/modules/gamelevels.py similarity index 100% rename from cpgames/modules/core/magictower/modules/gamelevels.py rename to cpgames/core/games/magictower/modules/gamelevels.py diff --git a/cpgames/modules/core/magictower/modules/interfaces/__init__.py b/cpgames/core/games/magictower/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/magictower/modules/interfaces/__init__.py rename to cpgames/core/games/magictower/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/magictower/modules/interfaces/start.py b/cpgames/core/games/magictower/modules/interfaces/start.py similarity index 100% rename from cpgames/modules/core/magictower/modules/interfaces/start.py rename to cpgames/core/games/magictower/modules/interfaces/start.py diff --git a/cpgames/modules/core/magictower/modules/maps/__init__.py b/cpgames/core/games/magictower/modules/maps/__init__.py similarity index 100% rename from cpgames/modules/core/magictower/modules/maps/__init__.py rename to cpgames/core/games/magictower/modules/maps/__init__.py diff --git a/cpgames/modules/core/magictower/modules/maps/mapparser.py b/cpgames/core/games/magictower/modules/maps/mapparser.py similarity index 100% rename from cpgames/modules/core/magictower/modules/maps/mapparser.py rename to cpgames/core/games/magictower/modules/maps/mapparser.py diff --git a/cpgames/modules/core/magictower/modules/sprites/__init__.py b/cpgames/core/games/magictower/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/magictower/modules/sprites/__init__.py rename to cpgames/core/games/magictower/modules/sprites/__init__.py diff --git a/cpgames/modules/core/magictower/modules/sprites/button.py b/cpgames/core/games/magictower/modules/sprites/button.py similarity index 100% rename from cpgames/modules/core/magictower/modules/sprites/button.py rename to cpgames/core/games/magictower/modules/sprites/button.py diff --git a/cpgames/modules/core/magictower/modules/sprites/hero.py b/cpgames/core/games/magictower/modules/sprites/hero.py similarity index 100% rename from cpgames/modules/core/magictower/modules/sprites/hero.py rename to cpgames/core/games/magictower/modules/sprites/hero.py diff --git a/cpgames/modules/core/magictower/resources/fonts/font_cn.ttf b/cpgames/core/games/magictower/resources/fonts/font_cn.ttf similarity index 100% rename from cpgames/modules/core/magictower/resources/fonts/font_cn.ttf rename to cpgames/core/games/magictower/resources/fonts/font_cn.ttf diff --git a/cpgames/modules/core/magictower/resources/fonts/font_en.ttf b/cpgames/core/games/magictower/resources/fonts/font_en.ttf similarity index 100% rename from cpgames/modules/core/magictower/resources/fonts/font_en.ttf rename to cpgames/core/games/magictower/resources/fonts/font_en.ttf diff --git a/cpgames/modules/core/magictower/resources/images/battlebg.png b/cpgames/core/games/magictower/resources/images/battlebg.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/battlebg.png rename to cpgames/core/games/magictower/resources/images/battlebg.png diff --git a/cpgames/modules/core/magictower/resources/images/blankbg.png b/cpgames/core/games/magictower/resources/images/blankbg.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/blankbg.png rename to cpgames/core/games/magictower/resources/images/blankbg.png diff --git a/cpgames/modules/core/magictower/resources/images/gamebg.png b/cpgames/core/games/magictower/resources/images/gamebg.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/gamebg.png rename to cpgames/core/games/magictower/resources/images/gamebg.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/0.png b/cpgames/core/games/magictower/resources/images/map0/0.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/0.png rename to cpgames/core/games/magictower/resources/images/map0/0.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/1.png b/cpgames/core/games/magictower/resources/images/map0/1.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/1.png rename to cpgames/core/games/magictower/resources/images/map0/1.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/10.png b/cpgames/core/games/magictower/resources/images/map0/10.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/10.png rename to cpgames/core/games/magictower/resources/images/map0/10.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/11.png b/cpgames/core/games/magictower/resources/images/map0/11.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/11.png rename to cpgames/core/games/magictower/resources/images/map0/11.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/12.png b/cpgames/core/games/magictower/resources/images/map0/12.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/12.png rename to cpgames/core/games/magictower/resources/images/map0/12.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/13.png b/cpgames/core/games/magictower/resources/images/map0/13.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/13.png rename to cpgames/core/games/magictower/resources/images/map0/13.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/14.png b/cpgames/core/games/magictower/resources/images/map0/14.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/14.png rename to cpgames/core/games/magictower/resources/images/map0/14.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/15.png b/cpgames/core/games/magictower/resources/images/map0/15.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/15.png rename to cpgames/core/games/magictower/resources/images/map0/15.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/181.png b/cpgames/core/games/magictower/resources/images/map0/181.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/181.png rename to cpgames/core/games/magictower/resources/images/map0/181.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/182.png b/cpgames/core/games/magictower/resources/images/map0/182.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/182.png rename to cpgames/core/games/magictower/resources/images/map0/182.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/183.png b/cpgames/core/games/magictower/resources/images/map0/183.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/183.png rename to cpgames/core/games/magictower/resources/images/map0/183.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/184.png b/cpgames/core/games/magictower/resources/images/map0/184.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/184.png rename to cpgames/core/games/magictower/resources/images/map0/184.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/185.png b/cpgames/core/games/magictower/resources/images/map0/185.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/185.png rename to cpgames/core/games/magictower/resources/images/map0/185.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/186.png b/cpgames/core/games/magictower/resources/images/map0/186.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/186.png rename to cpgames/core/games/magictower/resources/images/map0/186.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/187.png b/cpgames/core/games/magictower/resources/images/map0/187.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/187.png rename to cpgames/core/games/magictower/resources/images/map0/187.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/188.png b/cpgames/core/games/magictower/resources/images/map0/188.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/188.png rename to cpgames/core/games/magictower/resources/images/map0/188.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/189.png b/cpgames/core/games/magictower/resources/images/map0/189.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/189.png rename to cpgames/core/games/magictower/resources/images/map0/189.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/19.png b/cpgames/core/games/magictower/resources/images/map0/19.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/19.png rename to cpgames/core/games/magictower/resources/images/map0/19.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/191.png b/cpgames/core/games/magictower/resources/images/map0/191.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/191.png rename to cpgames/core/games/magictower/resources/images/map0/191.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/192.png b/cpgames/core/games/magictower/resources/images/map0/192.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/192.png rename to cpgames/core/games/magictower/resources/images/map0/192.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/193.png b/cpgames/core/games/magictower/resources/images/map0/193.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/193.png rename to cpgames/core/games/magictower/resources/images/map0/193.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/194.png b/cpgames/core/games/magictower/resources/images/map0/194.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/194.png rename to cpgames/core/games/magictower/resources/images/map0/194.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/195.png b/cpgames/core/games/magictower/resources/images/map0/195.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/195.png rename to cpgames/core/games/magictower/resources/images/map0/195.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/196.png b/cpgames/core/games/magictower/resources/images/map0/196.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/196.png rename to cpgames/core/games/magictower/resources/images/map0/196.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/197.png b/cpgames/core/games/magictower/resources/images/map0/197.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/197.png rename to cpgames/core/games/magictower/resources/images/map0/197.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/198.png b/cpgames/core/games/magictower/resources/images/map0/198.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/198.png rename to cpgames/core/games/magictower/resources/images/map0/198.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/199.png b/cpgames/core/games/magictower/resources/images/map0/199.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/199.png rename to cpgames/core/games/magictower/resources/images/map0/199.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/2.png b/cpgames/core/games/magictower/resources/images/map0/2.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/2.png rename to cpgames/core/games/magictower/resources/images/map0/2.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/20.png b/cpgames/core/games/magictower/resources/images/map0/20.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/20.png rename to cpgames/core/games/magictower/resources/images/map0/20.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/202.png b/cpgames/core/games/magictower/resources/images/map0/202.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/202.png rename to cpgames/core/games/magictower/resources/images/map0/202.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/203.png b/cpgames/core/games/magictower/resources/images/map0/203.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/203.png rename to cpgames/core/games/magictower/resources/images/map0/203.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/21.png b/cpgames/core/games/magictower/resources/images/map0/21.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/21.png rename to cpgames/core/games/magictower/resources/images/map0/21.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/22.png b/cpgames/core/games/magictower/resources/images/map0/22.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/22.png rename to cpgames/core/games/magictower/resources/images/map0/22.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/23.png b/cpgames/core/games/magictower/resources/images/map0/23.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/23.png rename to cpgames/core/games/magictower/resources/images/map0/23.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/24.png b/cpgames/core/games/magictower/resources/images/map0/24.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/24.png rename to cpgames/core/games/magictower/resources/images/map0/24.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/25.png b/cpgames/core/games/magictower/resources/images/map0/25.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/25.png rename to cpgames/core/games/magictower/resources/images/map0/25.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/26.png b/cpgames/core/games/magictower/resources/images/map0/26.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/26.png rename to cpgames/core/games/magictower/resources/images/map0/26.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/27.png b/cpgames/core/games/magictower/resources/images/map0/27.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/27.png rename to cpgames/core/games/magictower/resources/images/map0/27.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/28.png b/cpgames/core/games/magictower/resources/images/map0/28.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/28.png rename to cpgames/core/games/magictower/resources/images/map0/28.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/3.png b/cpgames/core/games/magictower/resources/images/map0/3.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/3.png rename to cpgames/core/games/magictower/resources/images/map0/3.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/30.png b/cpgames/core/games/magictower/resources/images/map0/30.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/30.png rename to cpgames/core/games/magictower/resources/images/map0/30.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/31.png b/cpgames/core/games/magictower/resources/images/map0/31.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/31.png rename to cpgames/core/games/magictower/resources/images/map0/31.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/32.png b/cpgames/core/games/magictower/resources/images/map0/32.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/32.png rename to cpgames/core/games/magictower/resources/images/map0/32.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/33.png b/cpgames/core/games/magictower/resources/images/map0/33.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/33.png rename to cpgames/core/games/magictower/resources/images/map0/33.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/34.png b/cpgames/core/games/magictower/resources/images/map0/34.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/34.png rename to cpgames/core/games/magictower/resources/images/map0/34.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/35.png b/cpgames/core/games/magictower/resources/images/map0/35.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/35.png rename to cpgames/core/games/magictower/resources/images/map0/35.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/36.png b/cpgames/core/games/magictower/resources/images/map0/36.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/36.png rename to cpgames/core/games/magictower/resources/images/map0/36.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/38.png b/cpgames/core/games/magictower/resources/images/map0/38.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/38.png rename to cpgames/core/games/magictower/resources/images/map0/38.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/39.png b/cpgames/core/games/magictower/resources/images/map0/39.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/39.png rename to cpgames/core/games/magictower/resources/images/map0/39.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/4.png b/cpgames/core/games/magictower/resources/images/map0/4.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/4.png rename to cpgames/core/games/magictower/resources/images/map0/4.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/40.png b/cpgames/core/games/magictower/resources/images/map0/40.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/40.png rename to cpgames/core/games/magictower/resources/images/map0/40.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/41.png b/cpgames/core/games/magictower/resources/images/map0/41.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/41.png rename to cpgames/core/games/magictower/resources/images/map0/41.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/42.png b/cpgames/core/games/magictower/resources/images/map0/42.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/42.png rename to cpgames/core/games/magictower/resources/images/map0/42.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/43.png b/cpgames/core/games/magictower/resources/images/map0/43.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/43.png rename to cpgames/core/games/magictower/resources/images/map0/43.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/44.png b/cpgames/core/games/magictower/resources/images/map0/44.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/44.png rename to cpgames/core/games/magictower/resources/images/map0/44.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/45.png b/cpgames/core/games/magictower/resources/images/map0/45.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/45.png rename to cpgames/core/games/magictower/resources/images/map0/45.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/46.png b/cpgames/core/games/magictower/resources/images/map0/46.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/46.png rename to cpgames/core/games/magictower/resources/images/map0/46.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/47.png b/cpgames/core/games/magictower/resources/images/map0/47.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/47.png rename to cpgames/core/games/magictower/resources/images/map0/47.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/48.png b/cpgames/core/games/magictower/resources/images/map0/48.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/48.png rename to cpgames/core/games/magictower/resources/images/map0/48.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/49.png b/cpgames/core/games/magictower/resources/images/map0/49.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/49.png rename to cpgames/core/games/magictower/resources/images/map0/49.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/5.png b/cpgames/core/games/magictower/resources/images/map0/5.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/5.png rename to cpgames/core/games/magictower/resources/images/map0/5.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/50.png b/cpgames/core/games/magictower/resources/images/map0/50.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/50.png rename to cpgames/core/games/magictower/resources/images/map0/50.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/51.png b/cpgames/core/games/magictower/resources/images/map0/51.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/51.png rename to cpgames/core/games/magictower/resources/images/map0/51.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/52.png b/cpgames/core/games/magictower/resources/images/map0/52.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/52.png rename to cpgames/core/games/magictower/resources/images/map0/52.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/53.png b/cpgames/core/games/magictower/resources/images/map0/53.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/53.png rename to cpgames/core/games/magictower/resources/images/map0/53.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/54.png b/cpgames/core/games/magictower/resources/images/map0/54.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/54.png rename to cpgames/core/games/magictower/resources/images/map0/54.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/55.png b/cpgames/core/games/magictower/resources/images/map0/55.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/55.png rename to cpgames/core/games/magictower/resources/images/map0/55.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/56.png b/cpgames/core/games/magictower/resources/images/map0/56.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/56.png rename to cpgames/core/games/magictower/resources/images/map0/56.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/57.png b/cpgames/core/games/magictower/resources/images/map0/57.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/57.png rename to cpgames/core/games/magictower/resources/images/map0/57.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/58.png b/cpgames/core/games/magictower/resources/images/map0/58.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/58.png rename to cpgames/core/games/magictower/resources/images/map0/58.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/59.png b/cpgames/core/games/magictower/resources/images/map0/59.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/59.png rename to cpgames/core/games/magictower/resources/images/map0/59.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/6.png b/cpgames/core/games/magictower/resources/images/map0/6.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/6.png rename to cpgames/core/games/magictower/resources/images/map0/6.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/60.png b/cpgames/core/games/magictower/resources/images/map0/60.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/60.png rename to cpgames/core/games/magictower/resources/images/map0/60.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/61.png b/cpgames/core/games/magictower/resources/images/map0/61.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/61.png rename to cpgames/core/games/magictower/resources/images/map0/61.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/62.png b/cpgames/core/games/magictower/resources/images/map0/62.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/62.png rename to cpgames/core/games/magictower/resources/images/map0/62.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/63.png b/cpgames/core/games/magictower/resources/images/map0/63.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/63.png rename to cpgames/core/games/magictower/resources/images/map0/63.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/64.png b/cpgames/core/games/magictower/resources/images/map0/64.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/64.png rename to cpgames/core/games/magictower/resources/images/map0/64.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/65.png b/cpgames/core/games/magictower/resources/images/map0/65.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/65.png rename to cpgames/core/games/magictower/resources/images/map0/65.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/66.png b/cpgames/core/games/magictower/resources/images/map0/66.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/66.png rename to cpgames/core/games/magictower/resources/images/map0/66.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/67.png b/cpgames/core/games/magictower/resources/images/map0/67.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/67.png rename to cpgames/core/games/magictower/resources/images/map0/67.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/68.png b/cpgames/core/games/magictower/resources/images/map0/68.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/68.png rename to cpgames/core/games/magictower/resources/images/map0/68.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/69.png b/cpgames/core/games/magictower/resources/images/map0/69.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/69.png rename to cpgames/core/games/magictower/resources/images/map0/69.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/7.png b/cpgames/core/games/magictower/resources/images/map0/7.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/7.png rename to cpgames/core/games/magictower/resources/images/map0/7.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/70.png b/cpgames/core/games/magictower/resources/images/map0/70.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/70.png rename to cpgames/core/games/magictower/resources/images/map0/70.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/71.png b/cpgames/core/games/magictower/resources/images/map0/71.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/71.png rename to cpgames/core/games/magictower/resources/images/map0/71.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/73.png b/cpgames/core/games/magictower/resources/images/map0/73.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/73.png rename to cpgames/core/games/magictower/resources/images/map0/73.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/75.png b/cpgames/core/games/magictower/resources/images/map0/75.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/75.png rename to cpgames/core/games/magictower/resources/images/map0/75.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/76.png b/cpgames/core/games/magictower/resources/images/map0/76.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/76.png rename to cpgames/core/games/magictower/resources/images/map0/76.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/78.png b/cpgames/core/games/magictower/resources/images/map0/78.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/78.png rename to cpgames/core/games/magictower/resources/images/map0/78.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/8.png b/cpgames/core/games/magictower/resources/images/map0/8.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/8.png rename to cpgames/core/games/magictower/resources/images/map0/8.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/80.png b/cpgames/core/games/magictower/resources/images/map0/80.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/80.png rename to cpgames/core/games/magictower/resources/images/map0/80.png diff --git a/cpgames/modules/core/magictower/resources/images/map0/9.png b/cpgames/core/games/magictower/resources/images/map0/9.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map0/9.png rename to cpgames/core/games/magictower/resources/images/map0/9.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/0.png b/cpgames/core/games/magictower/resources/images/map1/0.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/0.png rename to cpgames/core/games/magictower/resources/images/map1/0.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/1.png b/cpgames/core/games/magictower/resources/images/map1/1.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/1.png rename to cpgames/core/games/magictower/resources/images/map1/1.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/10.png b/cpgames/core/games/magictower/resources/images/map1/10.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/10.png rename to cpgames/core/games/magictower/resources/images/map1/10.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/11.png b/cpgames/core/games/magictower/resources/images/map1/11.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/11.png rename to cpgames/core/games/magictower/resources/images/map1/11.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/12.png b/cpgames/core/games/magictower/resources/images/map1/12.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/12.png rename to cpgames/core/games/magictower/resources/images/map1/12.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/13.png b/cpgames/core/games/magictower/resources/images/map1/13.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/13.png rename to cpgames/core/games/magictower/resources/images/map1/13.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/14.png b/cpgames/core/games/magictower/resources/images/map1/14.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/14.png rename to cpgames/core/games/magictower/resources/images/map1/14.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/15.png b/cpgames/core/games/magictower/resources/images/map1/15.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/15.png rename to cpgames/core/games/magictower/resources/images/map1/15.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/181.png b/cpgames/core/games/magictower/resources/images/map1/181.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/181.png rename to cpgames/core/games/magictower/resources/images/map1/181.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/182.png b/cpgames/core/games/magictower/resources/images/map1/182.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/182.png rename to cpgames/core/games/magictower/resources/images/map1/182.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/183.png b/cpgames/core/games/magictower/resources/images/map1/183.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/183.png rename to cpgames/core/games/magictower/resources/images/map1/183.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/184.png b/cpgames/core/games/magictower/resources/images/map1/184.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/184.png rename to cpgames/core/games/magictower/resources/images/map1/184.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/185.png b/cpgames/core/games/magictower/resources/images/map1/185.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/185.png rename to cpgames/core/games/magictower/resources/images/map1/185.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/186.png b/cpgames/core/games/magictower/resources/images/map1/186.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/186.png rename to cpgames/core/games/magictower/resources/images/map1/186.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/187.png b/cpgames/core/games/magictower/resources/images/map1/187.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/187.png rename to cpgames/core/games/magictower/resources/images/map1/187.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/188.png b/cpgames/core/games/magictower/resources/images/map1/188.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/188.png rename to cpgames/core/games/magictower/resources/images/map1/188.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/189.png b/cpgames/core/games/magictower/resources/images/map1/189.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/189.png rename to cpgames/core/games/magictower/resources/images/map1/189.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/19.png b/cpgames/core/games/magictower/resources/images/map1/19.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/19.png rename to cpgames/core/games/magictower/resources/images/map1/19.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/191.png b/cpgames/core/games/magictower/resources/images/map1/191.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/191.png rename to cpgames/core/games/magictower/resources/images/map1/191.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/192.png b/cpgames/core/games/magictower/resources/images/map1/192.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/192.png rename to cpgames/core/games/magictower/resources/images/map1/192.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/193.png b/cpgames/core/games/magictower/resources/images/map1/193.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/193.png rename to cpgames/core/games/magictower/resources/images/map1/193.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/194.png b/cpgames/core/games/magictower/resources/images/map1/194.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/194.png rename to cpgames/core/games/magictower/resources/images/map1/194.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/195.png b/cpgames/core/games/magictower/resources/images/map1/195.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/195.png rename to cpgames/core/games/magictower/resources/images/map1/195.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/196.png b/cpgames/core/games/magictower/resources/images/map1/196.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/196.png rename to cpgames/core/games/magictower/resources/images/map1/196.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/197.png b/cpgames/core/games/magictower/resources/images/map1/197.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/197.png rename to cpgames/core/games/magictower/resources/images/map1/197.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/198.png b/cpgames/core/games/magictower/resources/images/map1/198.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/198.png rename to cpgames/core/games/magictower/resources/images/map1/198.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/199.png b/cpgames/core/games/magictower/resources/images/map1/199.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/199.png rename to cpgames/core/games/magictower/resources/images/map1/199.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/2.png b/cpgames/core/games/magictower/resources/images/map1/2.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/2.png rename to cpgames/core/games/magictower/resources/images/map1/2.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/20.png b/cpgames/core/games/magictower/resources/images/map1/20.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/20.png rename to cpgames/core/games/magictower/resources/images/map1/20.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/202.png b/cpgames/core/games/magictower/resources/images/map1/202.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/202.png rename to cpgames/core/games/magictower/resources/images/map1/202.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/203.png b/cpgames/core/games/magictower/resources/images/map1/203.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/203.png rename to cpgames/core/games/magictower/resources/images/map1/203.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/21.png b/cpgames/core/games/magictower/resources/images/map1/21.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/21.png rename to cpgames/core/games/magictower/resources/images/map1/21.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/22.png b/cpgames/core/games/magictower/resources/images/map1/22.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/22.png rename to cpgames/core/games/magictower/resources/images/map1/22.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/23.png b/cpgames/core/games/magictower/resources/images/map1/23.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/23.png rename to cpgames/core/games/magictower/resources/images/map1/23.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/24.png b/cpgames/core/games/magictower/resources/images/map1/24.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/24.png rename to cpgames/core/games/magictower/resources/images/map1/24.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/25.png b/cpgames/core/games/magictower/resources/images/map1/25.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/25.png rename to cpgames/core/games/magictower/resources/images/map1/25.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/26.png b/cpgames/core/games/magictower/resources/images/map1/26.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/26.png rename to cpgames/core/games/magictower/resources/images/map1/26.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/27.png b/cpgames/core/games/magictower/resources/images/map1/27.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/27.png rename to cpgames/core/games/magictower/resources/images/map1/27.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/28.png b/cpgames/core/games/magictower/resources/images/map1/28.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/28.png rename to cpgames/core/games/magictower/resources/images/map1/28.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/3.png b/cpgames/core/games/magictower/resources/images/map1/3.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/3.png rename to cpgames/core/games/magictower/resources/images/map1/3.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/30.png b/cpgames/core/games/magictower/resources/images/map1/30.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/30.png rename to cpgames/core/games/magictower/resources/images/map1/30.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/31.png b/cpgames/core/games/magictower/resources/images/map1/31.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/31.png rename to cpgames/core/games/magictower/resources/images/map1/31.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/32.png b/cpgames/core/games/magictower/resources/images/map1/32.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/32.png rename to cpgames/core/games/magictower/resources/images/map1/32.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/33.png b/cpgames/core/games/magictower/resources/images/map1/33.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/33.png rename to cpgames/core/games/magictower/resources/images/map1/33.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/34.png b/cpgames/core/games/magictower/resources/images/map1/34.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/34.png rename to cpgames/core/games/magictower/resources/images/map1/34.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/35.png b/cpgames/core/games/magictower/resources/images/map1/35.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/35.png rename to cpgames/core/games/magictower/resources/images/map1/35.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/36.png b/cpgames/core/games/magictower/resources/images/map1/36.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/36.png rename to cpgames/core/games/magictower/resources/images/map1/36.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/38.png b/cpgames/core/games/magictower/resources/images/map1/38.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/38.png rename to cpgames/core/games/magictower/resources/images/map1/38.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/39.png b/cpgames/core/games/magictower/resources/images/map1/39.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/39.png rename to cpgames/core/games/magictower/resources/images/map1/39.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/4.png b/cpgames/core/games/magictower/resources/images/map1/4.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/4.png rename to cpgames/core/games/magictower/resources/images/map1/4.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/40.png b/cpgames/core/games/magictower/resources/images/map1/40.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/40.png rename to cpgames/core/games/magictower/resources/images/map1/40.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/41.png b/cpgames/core/games/magictower/resources/images/map1/41.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/41.png rename to cpgames/core/games/magictower/resources/images/map1/41.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/42.png b/cpgames/core/games/magictower/resources/images/map1/42.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/42.png rename to cpgames/core/games/magictower/resources/images/map1/42.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/43.png b/cpgames/core/games/magictower/resources/images/map1/43.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/43.png rename to cpgames/core/games/magictower/resources/images/map1/43.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/44.png b/cpgames/core/games/magictower/resources/images/map1/44.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/44.png rename to cpgames/core/games/magictower/resources/images/map1/44.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/45.png b/cpgames/core/games/magictower/resources/images/map1/45.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/45.png rename to cpgames/core/games/magictower/resources/images/map1/45.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/46.png b/cpgames/core/games/magictower/resources/images/map1/46.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/46.png rename to cpgames/core/games/magictower/resources/images/map1/46.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/47.png b/cpgames/core/games/magictower/resources/images/map1/47.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/47.png rename to cpgames/core/games/magictower/resources/images/map1/47.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/48.png b/cpgames/core/games/magictower/resources/images/map1/48.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/48.png rename to cpgames/core/games/magictower/resources/images/map1/48.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/49.png b/cpgames/core/games/magictower/resources/images/map1/49.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/49.png rename to cpgames/core/games/magictower/resources/images/map1/49.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/5.png b/cpgames/core/games/magictower/resources/images/map1/5.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/5.png rename to cpgames/core/games/magictower/resources/images/map1/5.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/50.png b/cpgames/core/games/magictower/resources/images/map1/50.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/50.png rename to cpgames/core/games/magictower/resources/images/map1/50.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/51.png b/cpgames/core/games/magictower/resources/images/map1/51.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/51.png rename to cpgames/core/games/magictower/resources/images/map1/51.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/52.png b/cpgames/core/games/magictower/resources/images/map1/52.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/52.png rename to cpgames/core/games/magictower/resources/images/map1/52.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/53.png b/cpgames/core/games/magictower/resources/images/map1/53.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/53.png rename to cpgames/core/games/magictower/resources/images/map1/53.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/54.png b/cpgames/core/games/magictower/resources/images/map1/54.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/54.png rename to cpgames/core/games/magictower/resources/images/map1/54.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/55.png b/cpgames/core/games/magictower/resources/images/map1/55.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/55.png rename to cpgames/core/games/magictower/resources/images/map1/55.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/56.png b/cpgames/core/games/magictower/resources/images/map1/56.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/56.png rename to cpgames/core/games/magictower/resources/images/map1/56.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/57.png b/cpgames/core/games/magictower/resources/images/map1/57.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/57.png rename to cpgames/core/games/magictower/resources/images/map1/57.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/58.png b/cpgames/core/games/magictower/resources/images/map1/58.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/58.png rename to cpgames/core/games/magictower/resources/images/map1/58.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/59.png b/cpgames/core/games/magictower/resources/images/map1/59.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/59.png rename to cpgames/core/games/magictower/resources/images/map1/59.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/6.png b/cpgames/core/games/magictower/resources/images/map1/6.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/6.png rename to cpgames/core/games/magictower/resources/images/map1/6.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/60.png b/cpgames/core/games/magictower/resources/images/map1/60.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/60.png rename to cpgames/core/games/magictower/resources/images/map1/60.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/61.png b/cpgames/core/games/magictower/resources/images/map1/61.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/61.png rename to cpgames/core/games/magictower/resources/images/map1/61.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/62.png b/cpgames/core/games/magictower/resources/images/map1/62.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/62.png rename to cpgames/core/games/magictower/resources/images/map1/62.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/63.png b/cpgames/core/games/magictower/resources/images/map1/63.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/63.png rename to cpgames/core/games/magictower/resources/images/map1/63.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/64.png b/cpgames/core/games/magictower/resources/images/map1/64.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/64.png rename to cpgames/core/games/magictower/resources/images/map1/64.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/65.png b/cpgames/core/games/magictower/resources/images/map1/65.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/65.png rename to cpgames/core/games/magictower/resources/images/map1/65.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/66.png b/cpgames/core/games/magictower/resources/images/map1/66.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/66.png rename to cpgames/core/games/magictower/resources/images/map1/66.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/67.png b/cpgames/core/games/magictower/resources/images/map1/67.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/67.png rename to cpgames/core/games/magictower/resources/images/map1/67.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/68.png b/cpgames/core/games/magictower/resources/images/map1/68.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/68.png rename to cpgames/core/games/magictower/resources/images/map1/68.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/69.png b/cpgames/core/games/magictower/resources/images/map1/69.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/69.png rename to cpgames/core/games/magictower/resources/images/map1/69.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/7.png b/cpgames/core/games/magictower/resources/images/map1/7.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/7.png rename to cpgames/core/games/magictower/resources/images/map1/7.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/70.png b/cpgames/core/games/magictower/resources/images/map1/70.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/70.png rename to cpgames/core/games/magictower/resources/images/map1/70.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/71.png b/cpgames/core/games/magictower/resources/images/map1/71.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/71.png rename to cpgames/core/games/magictower/resources/images/map1/71.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/73.png b/cpgames/core/games/magictower/resources/images/map1/73.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/73.png rename to cpgames/core/games/magictower/resources/images/map1/73.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/75.png b/cpgames/core/games/magictower/resources/images/map1/75.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/75.png rename to cpgames/core/games/magictower/resources/images/map1/75.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/76.png b/cpgames/core/games/magictower/resources/images/map1/76.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/76.png rename to cpgames/core/games/magictower/resources/images/map1/76.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/78.png b/cpgames/core/games/magictower/resources/images/map1/78.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/78.png rename to cpgames/core/games/magictower/resources/images/map1/78.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/8.png b/cpgames/core/games/magictower/resources/images/map1/8.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/8.png rename to cpgames/core/games/magictower/resources/images/map1/8.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/80.png b/cpgames/core/games/magictower/resources/images/map1/80.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/80.png rename to cpgames/core/games/magictower/resources/images/map1/80.png diff --git a/cpgames/modules/core/magictower/resources/images/map1/9.png b/cpgames/core/games/magictower/resources/images/map1/9.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/map1/9.png rename to cpgames/core/games/magictower/resources/images/map1/9.png diff --git a/cpgames/modules/core/magictower/resources/images/player/down.png b/cpgames/core/games/magictower/resources/images/player/down.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/player/down.png rename to cpgames/core/games/magictower/resources/images/player/down.png diff --git a/cpgames/modules/core/magictower/resources/images/player/left.png b/cpgames/core/games/magictower/resources/images/player/left.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/player/left.png rename to cpgames/core/games/magictower/resources/images/player/left.png diff --git a/cpgames/modules/core/magictower/resources/images/player/right.png b/cpgames/core/games/magictower/resources/images/player/right.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/player/right.png rename to cpgames/core/games/magictower/resources/images/player/right.png diff --git a/cpgames/modules/core/magictower/resources/images/player/up.png b/cpgames/core/games/magictower/resources/images/player/up.png similarity index 100% rename from cpgames/modules/core/magictower/resources/images/player/up.png rename to cpgames/core/games/magictower/resources/images/player/up.png diff --git a/cpgames/modules/core/magictower/resources/levels/0.lvl b/cpgames/core/games/magictower/resources/levels/0.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/0.lvl rename to cpgames/core/games/magictower/resources/levels/0.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/1.lvl b/cpgames/core/games/magictower/resources/levels/1.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/1.lvl rename to cpgames/core/games/magictower/resources/levels/1.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/10.lvl b/cpgames/core/games/magictower/resources/levels/10.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/10.lvl rename to cpgames/core/games/magictower/resources/levels/10.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/11.lvl b/cpgames/core/games/magictower/resources/levels/11.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/11.lvl rename to cpgames/core/games/magictower/resources/levels/11.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/12.lvl b/cpgames/core/games/magictower/resources/levels/12.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/12.lvl rename to cpgames/core/games/magictower/resources/levels/12.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/13.lvl b/cpgames/core/games/magictower/resources/levels/13.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/13.lvl rename to cpgames/core/games/magictower/resources/levels/13.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/14.lvl b/cpgames/core/games/magictower/resources/levels/14.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/14.lvl rename to cpgames/core/games/magictower/resources/levels/14.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/15.lvl b/cpgames/core/games/magictower/resources/levels/15.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/15.lvl rename to cpgames/core/games/magictower/resources/levels/15.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/16.lvl b/cpgames/core/games/magictower/resources/levels/16.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/16.lvl rename to cpgames/core/games/magictower/resources/levels/16.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/17.lvl b/cpgames/core/games/magictower/resources/levels/17.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/17.lvl rename to cpgames/core/games/magictower/resources/levels/17.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/18.lvl b/cpgames/core/games/magictower/resources/levels/18.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/18.lvl rename to cpgames/core/games/magictower/resources/levels/18.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/19.lvl b/cpgames/core/games/magictower/resources/levels/19.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/19.lvl rename to cpgames/core/games/magictower/resources/levels/19.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/2.lvl b/cpgames/core/games/magictower/resources/levels/2.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/2.lvl rename to cpgames/core/games/magictower/resources/levels/2.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/20.lvl b/cpgames/core/games/magictower/resources/levels/20.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/20.lvl rename to cpgames/core/games/magictower/resources/levels/20.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/21.lvl b/cpgames/core/games/magictower/resources/levels/21.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/21.lvl rename to cpgames/core/games/magictower/resources/levels/21.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/22.lvl b/cpgames/core/games/magictower/resources/levels/22.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/22.lvl rename to cpgames/core/games/magictower/resources/levels/22.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/23.lvl b/cpgames/core/games/magictower/resources/levels/23.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/23.lvl rename to cpgames/core/games/magictower/resources/levels/23.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/24.lvl b/cpgames/core/games/magictower/resources/levels/24.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/24.lvl rename to cpgames/core/games/magictower/resources/levels/24.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/25.lvl b/cpgames/core/games/magictower/resources/levels/25.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/25.lvl rename to cpgames/core/games/magictower/resources/levels/25.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/26.lvl b/cpgames/core/games/magictower/resources/levels/26.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/26.lvl rename to cpgames/core/games/magictower/resources/levels/26.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/3.lvl b/cpgames/core/games/magictower/resources/levels/3.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/3.lvl rename to cpgames/core/games/magictower/resources/levels/3.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/4.lvl b/cpgames/core/games/magictower/resources/levels/4.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/4.lvl rename to cpgames/core/games/magictower/resources/levels/4.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/5.lvl b/cpgames/core/games/magictower/resources/levels/5.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/5.lvl rename to cpgames/core/games/magictower/resources/levels/5.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/6.lvl b/cpgames/core/games/magictower/resources/levels/6.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/6.lvl rename to cpgames/core/games/magictower/resources/levels/6.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/7.lvl b/cpgames/core/games/magictower/resources/levels/7.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/7.lvl rename to cpgames/core/games/magictower/resources/levels/7.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/8.lvl b/cpgames/core/games/magictower/resources/levels/8.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/8.lvl rename to cpgames/core/games/magictower/resources/levels/8.lvl diff --git a/cpgames/modules/core/magictower/resources/levels/9.lvl b/cpgames/core/games/magictower/resources/levels/9.lvl similarity index 100% rename from cpgames/modules/core/magictower/resources/levels/9.lvl rename to cpgames/core/games/magictower/resources/levels/9.lvl diff --git a/cpgames/modules/core/maze/__init__.py b/cpgames/core/games/maze/__init__.py similarity index 100% rename from cpgames/modules/core/maze/__init__.py rename to cpgames/core/games/maze/__init__.py diff --git a/cpgames/modules/core/maze/maze.py b/cpgames/core/games/maze/maze.py similarity index 100% rename from cpgames/modules/core/maze/maze.py rename to cpgames/core/games/maze/maze.py diff --git a/cpgames/modules/core/maze/modules/__init__.py b/cpgames/core/games/maze/modules/__init__.py similarity index 100% rename from cpgames/modules/core/maze/modules/__init__.py rename to cpgames/core/games/maze/modules/__init__.py diff --git a/cpgames/modules/core/maze/modules/game.py b/cpgames/core/games/maze/modules/game.py similarity index 100% rename from cpgames/modules/core/maze/modules/game.py rename to cpgames/core/games/maze/modules/game.py diff --git a/cpgames/modules/core/maze/modules/misc.py b/cpgames/core/games/maze/modules/misc.py similarity index 100% rename from cpgames/modules/core/maze/modules/misc.py rename to cpgames/core/games/maze/modules/misc.py diff --git a/cpgames/modules/core/maze/modules/sprites.py b/cpgames/core/games/maze/modules/sprites.py similarity index 100% rename from cpgames/modules/core/maze/modules/sprites.py rename to cpgames/core/games/maze/modules/sprites.py diff --git a/cpgames/modules/core/maze/resources/audios/bgm.mp3 b/cpgames/core/games/maze/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/maze/resources/audios/bgm.mp3 rename to cpgames/core/games/maze/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/maze/resources/images/hero.png b/cpgames/core/games/maze/resources/images/hero.png similarity index 100% rename from cpgames/modules/core/maze/resources/images/hero.png rename to cpgames/core/games/maze/resources/images/hero.png diff --git a/cpgames/modules/core/minesweeper/__init__.py b/cpgames/core/games/minesweeper/__init__.py similarity index 100% rename from cpgames/modules/core/minesweeper/__init__.py rename to cpgames/core/games/minesweeper/__init__.py diff --git a/cpgames/modules/core/minesweeper/minesweeper.py b/cpgames/core/games/minesweeper/minesweeper.py similarity index 100% rename from cpgames/modules/core/minesweeper/minesweeper.py rename to cpgames/core/games/minesweeper/minesweeper.py diff --git a/cpgames/modules/core/minesweeper/modules/__init__.py b/cpgames/core/games/minesweeper/modules/__init__.py similarity index 100% rename from cpgames/modules/core/minesweeper/modules/__init__.py rename to cpgames/core/games/minesweeper/modules/__init__.py diff --git a/cpgames/modules/core/minesweeper/modules/emojibutton.py b/cpgames/core/games/minesweeper/modules/emojibutton.py similarity index 100% rename from cpgames/modules/core/minesweeper/modules/emojibutton.py rename to cpgames/core/games/minesweeper/modules/emojibutton.py diff --git a/cpgames/modules/core/minesweeper/modules/gamemap.py b/cpgames/core/games/minesweeper/modules/gamemap.py similarity index 100% rename from cpgames/modules/core/minesweeper/modules/gamemap.py rename to cpgames/core/games/minesweeper/modules/gamemap.py diff --git a/cpgames/modules/core/minesweeper/modules/mine.py b/cpgames/core/games/minesweeper/modules/mine.py similarity index 100% rename from cpgames/modules/core/minesweeper/modules/mine.py rename to cpgames/core/games/minesweeper/modules/mine.py diff --git a/cpgames/modules/core/minesweeper/modules/text.py b/cpgames/core/games/minesweeper/modules/text.py similarity index 100% rename from cpgames/modules/core/minesweeper/modules/text.py rename to cpgames/core/games/minesweeper/modules/text.py diff --git a/cpgames/modules/core/minesweeper/resources/audios/bgm.mp3 b/cpgames/core/games/minesweeper/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/minesweeper/resources/audios/bgm.mp3 rename to cpgames/core/games/minesweeper/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/minesweeper/resources/fonts/font.ttf b/cpgames/core/games/minesweeper/resources/fonts/font.ttf similarity index 100% rename from cpgames/modules/core/minesweeper/resources/fonts/font.ttf rename to cpgames/core/games/minesweeper/resources/fonts/font.ttf diff --git a/cpgames/modules/core/minesweeper/resources/images/0.bmp b/cpgames/core/games/minesweeper/resources/images/0.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/0.bmp rename to cpgames/core/games/minesweeper/resources/images/0.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/1.bmp b/cpgames/core/games/minesweeper/resources/images/1.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/1.bmp rename to cpgames/core/games/minesweeper/resources/images/1.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/2.bmp b/cpgames/core/games/minesweeper/resources/images/2.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/2.bmp rename to cpgames/core/games/minesweeper/resources/images/2.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/3.bmp b/cpgames/core/games/minesweeper/resources/images/3.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/3.bmp rename to cpgames/core/games/minesweeper/resources/images/3.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/4.bmp b/cpgames/core/games/minesweeper/resources/images/4.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/4.bmp rename to cpgames/core/games/minesweeper/resources/images/4.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/5.bmp b/cpgames/core/games/minesweeper/resources/images/5.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/5.bmp rename to cpgames/core/games/minesweeper/resources/images/5.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/6.bmp b/cpgames/core/games/minesweeper/resources/images/6.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/6.bmp rename to cpgames/core/games/minesweeper/resources/images/6.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/7.bmp b/cpgames/core/games/minesweeper/resources/images/7.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/7.bmp rename to cpgames/core/games/minesweeper/resources/images/7.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/8.bmp b/cpgames/core/games/minesweeper/resources/images/8.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/8.bmp rename to cpgames/core/games/minesweeper/resources/images/8.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/ask.bmp b/cpgames/core/games/minesweeper/resources/images/ask.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/ask.bmp rename to cpgames/core/games/minesweeper/resources/images/ask.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/blank.bmp b/cpgames/core/games/minesweeper/resources/images/blank.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/blank.bmp rename to cpgames/core/games/minesweeper/resources/images/blank.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/blood.bmp b/cpgames/core/games/minesweeper/resources/images/blood.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/blood.bmp rename to cpgames/core/games/minesweeper/resources/images/blood.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/error.bmp b/cpgames/core/games/minesweeper/resources/images/error.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/error.bmp rename to cpgames/core/games/minesweeper/resources/images/error.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/face_fail.png b/cpgames/core/games/minesweeper/resources/images/face_fail.png similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/face_fail.png rename to cpgames/core/games/minesweeper/resources/images/face_fail.png diff --git a/cpgames/modules/core/minesweeper/resources/images/face_normal.png b/cpgames/core/games/minesweeper/resources/images/face_normal.png similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/face_normal.png rename to cpgames/core/games/minesweeper/resources/images/face_normal.png diff --git a/cpgames/modules/core/minesweeper/resources/images/face_success.png b/cpgames/core/games/minesweeper/resources/images/face_success.png similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/face_success.png rename to cpgames/core/games/minesweeper/resources/images/face_success.png diff --git a/cpgames/modules/core/minesweeper/resources/images/flag.bmp b/cpgames/core/games/minesweeper/resources/images/flag.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/flag.bmp rename to cpgames/core/games/minesweeper/resources/images/flag.bmp diff --git a/cpgames/modules/core/minesweeper/resources/images/mine.bmp b/cpgames/core/games/minesweeper/resources/images/mine.bmp similarity index 100% rename from cpgames/modules/core/minesweeper/resources/images/mine.bmp rename to cpgames/core/games/minesweeper/resources/images/mine.bmp diff --git a/cpgames/modules/core/pacman/__init__.py b/cpgames/core/games/pacman/__init__.py similarity index 100% rename from cpgames/modules/core/pacman/__init__.py rename to cpgames/core/games/pacman/__init__.py diff --git a/cpgames/modules/core/pacman/modules/__init__.py b/cpgames/core/games/pacman/modules/__init__.py similarity index 100% rename from cpgames/modules/core/pacman/modules/__init__.py rename to cpgames/core/games/pacman/modules/__init__.py diff --git a/cpgames/modules/core/pacman/modules/levels.py b/cpgames/core/games/pacman/modules/levels.py similarity index 100% rename from cpgames/modules/core/pacman/modules/levels.py rename to cpgames/core/games/pacman/modules/levels.py diff --git a/cpgames/modules/core/pacman/modules/sprites.py b/cpgames/core/games/pacman/modules/sprites.py similarity index 100% rename from cpgames/modules/core/pacman/modules/sprites.py rename to cpgames/core/games/pacman/modules/sprites.py diff --git a/cpgames/modules/core/pacman/pacman.py b/cpgames/core/games/pacman/pacman.py similarity index 100% rename from cpgames/modules/core/pacman/pacman.py rename to cpgames/core/games/pacman/pacman.py diff --git a/cpgames/modules/core/pacman/resources/audios/bgm.mp3 b/cpgames/core/games/pacman/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/pacman/resources/audios/bgm.mp3 rename to cpgames/core/games/pacman/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/pacman/resources/fonts/ALGER.ttf b/cpgames/core/games/pacman/resources/fonts/ALGER.ttf similarity index 100% rename from cpgames/modules/core/pacman/resources/fonts/ALGER.ttf rename to cpgames/core/games/pacman/resources/fonts/ALGER.ttf diff --git a/cpgames/modules/core/pacman/resources/images/Blinky.png b/cpgames/core/games/pacman/resources/images/Blinky.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/Blinky.png rename to cpgames/core/games/pacman/resources/images/Blinky.png diff --git a/cpgames/modules/core/pacman/resources/images/Clyde.png b/cpgames/core/games/pacman/resources/images/Clyde.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/Clyde.png rename to cpgames/core/games/pacman/resources/images/Clyde.png diff --git a/cpgames/modules/core/pacman/resources/images/Inky.png b/cpgames/core/games/pacman/resources/images/Inky.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/Inky.png rename to cpgames/core/games/pacman/resources/images/Inky.png diff --git a/cpgames/modules/core/pacman/resources/images/Pinky.png b/cpgames/core/games/pacman/resources/images/Pinky.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/Pinky.png rename to cpgames/core/games/pacman/resources/images/Pinky.png diff --git a/cpgames/modules/core/pacman/resources/images/icon.png b/cpgames/core/games/pacman/resources/images/icon.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/icon.png rename to cpgames/core/games/pacman/resources/images/icon.png diff --git a/cpgames/modules/core/pacman/resources/images/pacman.png b/cpgames/core/games/pacman/resources/images/pacman.png similarity index 100% rename from cpgames/modules/core/pacman/resources/images/pacman.png rename to cpgames/core/games/pacman/resources/images/pacman.png diff --git a/cpgames/modules/core/pingpong/__init__.py b/cpgames/core/games/pingpong/__init__.py similarity index 100% rename from cpgames/modules/core/pingpong/__init__.py rename to cpgames/core/games/pingpong/__init__.py diff --git a/cpgames/modules/core/pingpong/modules/__init__.py b/cpgames/core/games/pingpong/modules/__init__.py similarity index 100% rename from cpgames/modules/core/pingpong/modules/__init__.py rename to cpgames/core/games/pingpong/modules/__init__.py diff --git a/cpgames/modules/core/pingpong/modules/sprites.py b/cpgames/core/games/pingpong/modules/sprites.py similarity index 100% rename from cpgames/modules/core/pingpong/modules/sprites.py rename to cpgames/core/games/pingpong/modules/sprites.py diff --git a/cpgames/modules/core/pingpong/modules/utils.py b/cpgames/core/games/pingpong/modules/utils.py similarity index 100% rename from cpgames/modules/core/pingpong/modules/utils.py rename to cpgames/core/games/pingpong/modules/utils.py diff --git a/cpgames/modules/core/pingpong/pingpong.py b/cpgames/core/games/pingpong/pingpong.py similarity index 100% rename from cpgames/modules/core/pingpong/pingpong.py rename to cpgames/core/games/pingpong/pingpong.py diff --git a/cpgames/modules/core/pingpong/resources/audios/bgm.mp3 b/cpgames/core/games/pingpong/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/pingpong/resources/audios/bgm.mp3 rename to cpgames/core/games/pingpong/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/pingpong/resources/audios/goal.wav b/cpgames/core/games/pingpong/resources/audios/goal.wav similarity index 100% rename from cpgames/modules/core/pingpong/resources/audios/goal.wav rename to cpgames/core/games/pingpong/resources/audios/goal.wav diff --git a/cpgames/modules/core/pingpong/resources/audios/hit.wav b/cpgames/core/games/pingpong/resources/audios/hit.wav similarity index 100% rename from cpgames/modules/core/pingpong/resources/audios/hit.wav rename to cpgames/core/games/pingpong/resources/audios/hit.wav diff --git a/cpgames/modules/core/pingpong/resources/images/ball.png b/cpgames/core/games/pingpong/resources/images/ball.png similarity index 100% rename from cpgames/modules/core/pingpong/resources/images/ball.png rename to cpgames/core/games/pingpong/resources/images/ball.png diff --git a/cpgames/modules/core/pingpong/resources/images/racket.png b/cpgames/core/games/pingpong/resources/images/racket.png similarity index 100% rename from cpgames/modules/core/pingpong/resources/images/racket.png rename to cpgames/core/games/pingpong/resources/images/racket.png diff --git a/cpgames/modules/core/puzzlepieces/__init__.py b/cpgames/core/games/puzzlepieces/__init__.py similarity index 100% rename from cpgames/modules/core/puzzlepieces/__init__.py rename to cpgames/core/games/puzzlepieces/__init__.py diff --git a/cpgames/modules/core/puzzlepieces/puzzlepieces.py b/cpgames/core/games/puzzlepieces/puzzlepieces.py similarity index 100% rename from cpgames/modules/core/puzzlepieces/puzzlepieces.py rename to cpgames/core/games/puzzlepieces/puzzlepieces.py diff --git a/cpgames/modules/core/puzzlepieces/resources/images/1.jpg b/cpgames/core/games/puzzlepieces/resources/images/1.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/1.jpg rename to cpgames/core/games/puzzlepieces/resources/images/1.jpg diff --git a/cpgames/modules/core/puzzlepieces/resources/images/2.jpg b/cpgames/core/games/puzzlepieces/resources/images/2.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/2.jpg rename to cpgames/core/games/puzzlepieces/resources/images/2.jpg diff --git a/cpgames/modules/core/puzzlepieces/resources/images/3.jpg b/cpgames/core/games/puzzlepieces/resources/images/3.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/3.jpg rename to cpgames/core/games/puzzlepieces/resources/images/3.jpg diff --git a/cpgames/modules/core/puzzlepieces/resources/images/4.jpg b/cpgames/core/games/puzzlepieces/resources/images/4.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/4.jpg rename to cpgames/core/games/puzzlepieces/resources/images/4.jpg diff --git a/cpgames/modules/core/puzzlepieces/resources/images/5.JPG b/cpgames/core/games/puzzlepieces/resources/images/5.JPG similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/5.JPG rename to cpgames/core/games/puzzlepieces/resources/images/5.JPG diff --git a/cpgames/modules/core/puzzlepieces/resources/images/6.jpg b/cpgames/core/games/puzzlepieces/resources/images/6.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/6.jpg rename to cpgames/core/games/puzzlepieces/resources/images/6.jpg diff --git a/cpgames/modules/core/puzzlepieces/resources/images/7.jpg b/cpgames/core/games/puzzlepieces/resources/images/7.jpg similarity index 100% rename from cpgames/modules/core/puzzlepieces/resources/images/7.jpg rename to cpgames/core/games/puzzlepieces/resources/images/7.jpg diff --git a/cpgames/modules/core/ski/__init__.py b/cpgames/core/games/ski/__init__.py similarity index 100% rename from cpgames/modules/core/ski/__init__.py rename to cpgames/core/games/ski/__init__.py diff --git a/cpgames/modules/core/ski/resources/audios/bgm.mp3 b/cpgames/core/games/ski/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/ski/resources/audios/bgm.mp3 rename to cpgames/core/games/ski/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/ski/resources/images/flag.png b/cpgames/core/games/ski/resources/images/flag.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/flag.png rename to cpgames/core/games/ski/resources/images/flag.png diff --git a/cpgames/modules/core/ski/resources/images/skier_fall.png b/cpgames/core/games/ski/resources/images/skier_fall.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_fall.png rename to cpgames/core/games/ski/resources/images/skier_fall.png diff --git a/cpgames/modules/core/ski/resources/images/skier_forward.png b/cpgames/core/games/ski/resources/images/skier_forward.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_forward.png rename to cpgames/core/games/ski/resources/images/skier_forward.png diff --git a/cpgames/modules/core/ski/resources/images/skier_left1.png b/cpgames/core/games/ski/resources/images/skier_left1.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_left1.png rename to cpgames/core/games/ski/resources/images/skier_left1.png diff --git a/cpgames/modules/core/ski/resources/images/skier_left2.png b/cpgames/core/games/ski/resources/images/skier_left2.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_left2.png rename to cpgames/core/games/ski/resources/images/skier_left2.png diff --git a/cpgames/modules/core/ski/resources/images/skier_right1.png b/cpgames/core/games/ski/resources/images/skier_right1.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_right1.png rename to cpgames/core/games/ski/resources/images/skier_right1.png diff --git a/cpgames/modules/core/ski/resources/images/skier_right2.png b/cpgames/core/games/ski/resources/images/skier_right2.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/skier_right2.png rename to cpgames/core/games/ski/resources/images/skier_right2.png diff --git a/cpgames/modules/core/ski/resources/images/tree.png b/cpgames/core/games/ski/resources/images/tree.png similarity index 100% rename from cpgames/modules/core/ski/resources/images/tree.png rename to cpgames/core/games/ski/resources/images/tree.png diff --git a/cpgames/modules/core/ski/ski.py b/cpgames/core/games/ski/ski.py similarity index 100% rename from cpgames/modules/core/ski/ski.py rename to cpgames/core/games/ski/ski.py diff --git a/cpgames/modules/core/sokoban/__init__.py b/cpgames/core/games/sokoban/__init__.py similarity index 100% rename from cpgames/modules/core/sokoban/__init__.py rename to cpgames/core/games/sokoban/__init__.py diff --git a/cpgames/modules/core/sokoban/modules/__init__.py b/cpgames/core/games/sokoban/modules/__init__.py similarity index 100% rename from cpgames/modules/core/sokoban/modules/__init__.py rename to cpgames/core/games/sokoban/modules/__init__.py diff --git a/cpgames/modules/core/sokoban/modules/interfaces.py b/cpgames/core/games/sokoban/modules/interfaces.py similarity index 100% rename from cpgames/modules/core/sokoban/modules/interfaces.py rename to cpgames/core/games/sokoban/modules/interfaces.py diff --git a/cpgames/modules/core/sokoban/modules/sprites.py b/cpgames/core/games/sokoban/modules/sprites.py similarity index 100% rename from cpgames/modules/core/sokoban/modules/sprites.py rename to cpgames/core/games/sokoban/modules/sprites.py diff --git a/cpgames/modules/core/sokoban/resources/audios/EineLiebe.mp3 b/cpgames/core/games/sokoban/resources/audios/EineLiebe.mp3 similarity index 100% rename from cpgames/modules/core/sokoban/resources/audios/EineLiebe.mp3 rename to cpgames/core/games/sokoban/resources/audios/EineLiebe.mp3 diff --git a/cpgames/modules/core/sokoban/resources/images/box.png b/cpgames/core/games/sokoban/resources/images/box.png similarity index 100% rename from cpgames/modules/core/sokoban/resources/images/box.png rename to cpgames/core/games/sokoban/resources/images/box.png diff --git a/cpgames/modules/core/sokoban/resources/images/player.png b/cpgames/core/games/sokoban/resources/images/player.png similarity index 100% rename from cpgames/modules/core/sokoban/resources/images/player.png rename to cpgames/core/games/sokoban/resources/images/player.png diff --git a/cpgames/modules/core/sokoban/resources/images/target.png b/cpgames/core/games/sokoban/resources/images/target.png similarity index 100% rename from cpgames/modules/core/sokoban/resources/images/target.png rename to cpgames/core/games/sokoban/resources/images/target.png diff --git a/cpgames/modules/core/sokoban/resources/images/wall.png b/cpgames/core/games/sokoban/resources/images/wall.png similarity index 100% rename from cpgames/modules/core/sokoban/resources/images/wall.png rename to cpgames/core/games/sokoban/resources/images/wall.png diff --git a/cpgames/modules/core/sokoban/resources/levels/1.level b/cpgames/core/games/sokoban/resources/levels/1.level similarity index 100% rename from cpgames/modules/core/sokoban/resources/levels/1.level rename to cpgames/core/games/sokoban/resources/levels/1.level diff --git a/cpgames/modules/core/sokoban/resources/levels/2.level b/cpgames/core/games/sokoban/resources/levels/2.level similarity index 100% rename from cpgames/modules/core/sokoban/resources/levels/2.level rename to cpgames/core/games/sokoban/resources/levels/2.level diff --git a/cpgames/modules/core/sokoban/resources/levels/3.level b/cpgames/core/games/sokoban/resources/levels/3.level similarity index 100% rename from cpgames/modules/core/sokoban/resources/levels/3.level rename to cpgames/core/games/sokoban/resources/levels/3.level diff --git a/cpgames/modules/core/sokoban/resources/levels/4.level b/cpgames/core/games/sokoban/resources/levels/4.level similarity index 100% rename from cpgames/modules/core/sokoban/resources/levels/4.level rename to cpgames/core/games/sokoban/resources/levels/4.level diff --git a/cpgames/modules/core/sokoban/sokoban.py b/cpgames/core/games/sokoban/sokoban.py similarity index 100% rename from cpgames/modules/core/sokoban/sokoban.py rename to cpgames/core/games/sokoban/sokoban.py diff --git a/cpgames/modules/core/tankwar/__init__.py b/cpgames/core/games/tankwar/__init__.py similarity index 100% rename from cpgames/modules/core/tankwar/__init__.py rename to cpgames/core/games/tankwar/__init__.py diff --git a/cpgames/modules/core/tankwar/modules/__init__.py b/cpgames/core/games/tankwar/modules/__init__.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/__init__.py rename to cpgames/core/games/tankwar/modules/__init__.py diff --git a/cpgames/modules/core/tankwar/modules/gamelevel.py b/cpgames/core/games/tankwar/modules/gamelevel.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/gamelevel.py rename to cpgames/core/games/tankwar/modules/gamelevel.py diff --git a/cpgames/modules/core/tankwar/modules/interfaces/__init__.py b/cpgames/core/games/tankwar/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/interfaces/__init__.py rename to cpgames/core/games/tankwar/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/tankwar/modules/interfaces/endinterface.py b/cpgames/core/games/tankwar/modules/interfaces/endinterface.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/interfaces/endinterface.py rename to cpgames/core/games/tankwar/modules/interfaces/endinterface.py diff --git a/cpgames/modules/core/tankwar/modules/interfaces/startinterface.py b/cpgames/core/games/tankwar/modules/interfaces/startinterface.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/interfaces/startinterface.py rename to cpgames/core/games/tankwar/modules/interfaces/startinterface.py diff --git a/cpgames/modules/core/tankwar/modules/interfaces/switchinterface.py b/cpgames/core/games/tankwar/modules/interfaces/switchinterface.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/interfaces/switchinterface.py rename to cpgames/core/games/tankwar/modules/interfaces/switchinterface.py diff --git a/cpgames/modules/core/tankwar/modules/levels/1.lvl b/cpgames/core/games/tankwar/modules/levels/1.lvl similarity index 100% rename from cpgames/modules/core/tankwar/modules/levels/1.lvl rename to cpgames/core/games/tankwar/modules/levels/1.lvl diff --git a/cpgames/modules/core/tankwar/modules/levels/2.lvl b/cpgames/core/games/tankwar/modules/levels/2.lvl similarity index 100% rename from cpgames/modules/core/tankwar/modules/levels/2.lvl rename to cpgames/core/games/tankwar/modules/levels/2.lvl diff --git a/cpgames/modules/core/tankwar/modules/levels/3.lvl b/cpgames/core/games/tankwar/modules/levels/3.lvl similarity index 100% rename from cpgames/modules/core/tankwar/modules/levels/3.lvl rename to cpgames/core/games/tankwar/modules/levels/3.lvl diff --git a/cpgames/modules/core/tankwar/modules/sprites/__init__.py b/cpgames/core/games/tankwar/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/__init__.py rename to cpgames/core/games/tankwar/modules/sprites/__init__.py diff --git a/cpgames/modules/core/tankwar/modules/sprites/bullet.py b/cpgames/core/games/tankwar/modules/sprites/bullet.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/bullet.py rename to cpgames/core/games/tankwar/modules/sprites/bullet.py diff --git a/cpgames/modules/core/tankwar/modules/sprites/foods.py b/cpgames/core/games/tankwar/modules/sprites/foods.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/foods.py rename to cpgames/core/games/tankwar/modules/sprites/foods.py diff --git a/cpgames/modules/core/tankwar/modules/sprites/home.py b/cpgames/core/games/tankwar/modules/sprites/home.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/home.py rename to cpgames/core/games/tankwar/modules/sprites/home.py diff --git a/cpgames/modules/core/tankwar/modules/sprites/scenes.py b/cpgames/core/games/tankwar/modules/sprites/scenes.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/scenes.py rename to cpgames/core/games/tankwar/modules/sprites/scenes.py diff --git a/cpgames/modules/core/tankwar/modules/sprites/tanks.py b/cpgames/core/games/tankwar/modules/sprites/tanks.py similarity index 100% rename from cpgames/modules/core/tankwar/modules/sprites/tanks.py rename to cpgames/core/games/tankwar/modules/sprites/tanks.py diff --git a/cpgames/modules/core/tankwar/resources/audios/Gunfire.wav b/cpgames/core/games/tankwar/resources/audios/Gunfire.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/Gunfire.wav rename to cpgames/core/games/tankwar/resources/audios/Gunfire.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/add.wav b/cpgames/core/games/tankwar/resources/audios/add.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/add.wav rename to cpgames/core/games/tankwar/resources/audios/add.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/bang.wav b/cpgames/core/games/tankwar/resources/audios/bang.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/bang.wav rename to cpgames/core/games/tankwar/resources/audios/bang.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/blast.wav b/cpgames/core/games/tankwar/resources/audios/blast.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/blast.wav rename to cpgames/core/games/tankwar/resources/audios/blast.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/fire.wav b/cpgames/core/games/tankwar/resources/audios/fire.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/fire.wav rename to cpgames/core/games/tankwar/resources/audios/fire.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/hit.wav b/cpgames/core/games/tankwar/resources/audios/hit.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/hit.wav rename to cpgames/core/games/tankwar/resources/audios/hit.wav diff --git a/cpgames/modules/core/tankwar/resources/audios/start.wav b/cpgames/core/games/tankwar/resources/audios/start.wav similarity index 100% rename from cpgames/modules/core/tankwar/resources/audios/start.wav rename to cpgames/core/games/tankwar/resources/audios/start.wav diff --git a/cpgames/modules/core/tankwar/resources/images/bullet/bullet_down.png b/cpgames/core/games/tankwar/resources/images/bullet/bullet_down.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/bullet/bullet_down.png rename to cpgames/core/games/tankwar/resources/images/bullet/bullet_down.png diff --git a/cpgames/modules/core/tankwar/resources/images/bullet/bullet_left.png b/cpgames/core/games/tankwar/resources/images/bullet/bullet_left.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/bullet/bullet_left.png rename to cpgames/core/games/tankwar/resources/images/bullet/bullet_left.png diff --git a/cpgames/modules/core/tankwar/resources/images/bullet/bullet_right.png b/cpgames/core/games/tankwar/resources/images/bullet/bullet_right.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/bullet/bullet_right.png rename to cpgames/core/games/tankwar/resources/images/bullet/bullet_right.png diff --git a/cpgames/modules/core/tankwar/resources/images/bullet/bullet_up.png b/cpgames/core/games/tankwar/resources/images/bullet/bullet_up.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/bullet/bullet_up.png rename to cpgames/core/games/tankwar/resources/images/bullet/bullet_up.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_0.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_0.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_1.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_1.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_2.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_2.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_3.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_3.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_1_3.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_1_3.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_0.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_0.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_1.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_1.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_2.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_2.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_3.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_3.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_2_3.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_2_3.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_0.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_0.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_1.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_1.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_2.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_2.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_3.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_3.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_3_3.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_3_3.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_0.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_0.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_1.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_1.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_2.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_2.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_3.png b/cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_3.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/enemyTank/enemy_4_3.png rename to cpgames/core/games/tankwar/resources/images/enemyTank/enemy_4_3.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_boom.png b/cpgames/core/games/tankwar/resources/images/food/food_boom.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_boom.png rename to cpgames/core/games/tankwar/resources/images/food/food_boom.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_clock.png b/cpgames/core/games/tankwar/resources/images/food/food_clock.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_clock.png rename to cpgames/core/games/tankwar/resources/images/food/food_clock.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_gun.png b/cpgames/core/games/tankwar/resources/images/food/food_gun.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_gun.png rename to cpgames/core/games/tankwar/resources/images/food/food_gun.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_iron.png b/cpgames/core/games/tankwar/resources/images/food/food_iron.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_iron.png rename to cpgames/core/games/tankwar/resources/images/food/food_iron.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_protect.png b/cpgames/core/games/tankwar/resources/images/food/food_protect.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_protect.png rename to cpgames/core/games/tankwar/resources/images/food/food_protect.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_star.png b/cpgames/core/games/tankwar/resources/images/food/food_star.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_star.png rename to cpgames/core/games/tankwar/resources/images/food/food_star.png diff --git a/cpgames/modules/core/tankwar/resources/images/food/food_tank.png b/cpgames/core/games/tankwar/resources/images/food/food_tank.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/food/food_tank.png rename to cpgames/core/games/tankwar/resources/images/food/food_tank.png diff --git a/cpgames/modules/core/tankwar/resources/images/home/home1.png b/cpgames/core/games/tankwar/resources/images/home/home1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/home/home1.png rename to cpgames/core/games/tankwar/resources/images/home/home1.png diff --git a/cpgames/modules/core/tankwar/resources/images/home/home2.png b/cpgames/core/games/tankwar/resources/images/home/home2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/home/home2.png rename to cpgames/core/games/tankwar/resources/images/home/home2.png diff --git a/cpgames/modules/core/tankwar/resources/images/home/home_destroyed.png b/cpgames/core/games/tankwar/resources/images/home/home_destroyed.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/home/home_destroyed.png rename to cpgames/core/games/tankwar/resources/images/home/home_destroyed.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/appear.png b/cpgames/core/games/tankwar/resources/images/others/appear.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/appear.png rename to cpgames/core/games/tankwar/resources/images/others/appear.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/background.png b/cpgames/core/games/tankwar/resources/images/others/background.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/background.png rename to cpgames/core/games/tankwar/resources/images/others/background.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/boom_dynamic.png b/cpgames/core/games/tankwar/resources/images/others/boom_dynamic.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/boom_dynamic.png rename to cpgames/core/games/tankwar/resources/images/others/boom_dynamic.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/boom_static.png b/cpgames/core/games/tankwar/resources/images/others/boom_static.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/boom_static.png rename to cpgames/core/games/tankwar/resources/images/others/boom_static.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/gamebar.png b/cpgames/core/games/tankwar/resources/images/others/gamebar.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/gamebar.png rename to cpgames/core/games/tankwar/resources/images/others/gamebar.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/gameover.png b/cpgames/core/games/tankwar/resources/images/others/gameover.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/gameover.png rename to cpgames/core/games/tankwar/resources/images/others/gameover.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/logo.png b/cpgames/core/games/tankwar/resources/images/others/logo.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/logo.png rename to cpgames/core/games/tankwar/resources/images/others/logo.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/mask.png b/cpgames/core/games/tankwar/resources/images/others/mask.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/mask.png rename to cpgames/core/games/tankwar/resources/images/others/mask.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/protect.png b/cpgames/core/games/tankwar/resources/images/others/protect.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/protect.png rename to cpgames/core/games/tankwar/resources/images/others/protect.png diff --git a/cpgames/modules/core/tankwar/resources/images/others/tip.png b/cpgames/core/games/tankwar/resources/images/others/tip.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/others/tip.png rename to cpgames/core/games/tankwar/resources/images/others/tip.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_0.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_0.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_1.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_1.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_2.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T1_2.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T1_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_0.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_0.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_0.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_0.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_1.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_1.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_1.png diff --git a/cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_2.png b/cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/playerTank/tank_T2_2.png rename to cpgames/core/games/tankwar/resources/images/playerTank/tank_T2_2.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/brick.png b/cpgames/core/games/tankwar/resources/images/scene/brick.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/brick.png rename to cpgames/core/games/tankwar/resources/images/scene/brick.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/ice.png b/cpgames/core/games/tankwar/resources/images/scene/ice.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/ice.png rename to cpgames/core/games/tankwar/resources/images/scene/ice.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/iron.png b/cpgames/core/games/tankwar/resources/images/scene/iron.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/iron.png rename to cpgames/core/games/tankwar/resources/images/scene/iron.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/river1.png b/cpgames/core/games/tankwar/resources/images/scene/river1.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/river1.png rename to cpgames/core/games/tankwar/resources/images/scene/river1.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/river2.png b/cpgames/core/games/tankwar/resources/images/scene/river2.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/river2.png rename to cpgames/core/games/tankwar/resources/images/scene/river2.png diff --git a/cpgames/modules/core/tankwar/resources/images/scene/tree.png b/cpgames/core/games/tankwar/resources/images/scene/tree.png similarity index 100% rename from cpgames/modules/core/tankwar/resources/images/scene/tree.png rename to cpgames/core/games/tankwar/resources/images/scene/tree.png diff --git a/cpgames/modules/core/tankwar/tankwar.py b/cpgames/core/games/tankwar/tankwar.py similarity index 100% rename from cpgames/modules/core/tankwar/tankwar.py rename to cpgames/core/games/tankwar/tankwar.py diff --git a/cpgames/modules/core/tetris/__init__.py b/cpgames/core/games/tetris/__init__.py similarity index 100% rename from cpgames/modules/core/tetris/__init__.py rename to cpgames/core/games/tetris/__init__.py diff --git a/cpgames/modules/core/tetris/modules/__init__.py b/cpgames/core/games/tetris/modules/__init__.py similarity index 100% rename from cpgames/modules/core/tetris/modules/__init__.py rename to cpgames/core/games/tetris/modules/__init__.py diff --git a/cpgames/modules/core/tetris/modules/gameboard.py b/cpgames/core/games/tetris/modules/gameboard.py similarity index 100% rename from cpgames/modules/core/tetris/modules/gameboard.py rename to cpgames/core/games/tetris/modules/gameboard.py diff --git a/cpgames/modules/core/tetris/modules/misc.py b/cpgames/core/games/tetris/modules/misc.py similarity index 100% rename from cpgames/modules/core/tetris/modules/misc.py rename to cpgames/core/games/tetris/modules/misc.py diff --git a/cpgames/modules/core/tetris/modules/shapes.py b/cpgames/core/games/tetris/modules/shapes.py similarity index 100% rename from cpgames/modules/core/tetris/modules/shapes.py rename to cpgames/core/games/tetris/modules/shapes.py diff --git a/cpgames/modules/core/tetris/resources/icon.jpg b/cpgames/core/games/tetris/resources/icon.jpg similarity index 100% rename from cpgames/modules/core/tetris/resources/icon.jpg rename to cpgames/core/games/tetris/resources/icon.jpg diff --git a/cpgames/modules/core/tetris/tetris.py b/cpgames/core/games/tetris/tetris.py similarity index 100% rename from cpgames/modules/core/tetris/tetris.py rename to cpgames/core/games/tetris/tetris.py diff --git a/cpgames/modules/core/towerdefense/__init__.py b/cpgames/core/games/towerdefense/__init__.py similarity index 100% rename from cpgames/modules/core/towerdefense/__init__.py rename to cpgames/core/games/towerdefense/__init__.py diff --git a/cpgames/modules/core/towerdefense/modules/__init__.py b/cpgames/core/games/towerdefense/modules/__init__.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/__init__.py rename to cpgames/core/games/towerdefense/modules/__init__.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/__init__.py b/cpgames/core/games/towerdefense/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/__init__.py rename to cpgames/core/games/towerdefense/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/choice.py b/cpgames/core/games/towerdefense/modules/interfaces/choice.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/choice.py rename to cpgames/core/games/towerdefense/modules/interfaces/choice.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/end.py b/cpgames/core/games/towerdefense/modules/interfaces/end.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/end.py rename to cpgames/core/games/towerdefense/modules/interfaces/end.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/gaming.py b/cpgames/core/games/towerdefense/modules/interfaces/gaming.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/gaming.py rename to cpgames/core/games/towerdefense/modules/interfaces/gaming.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/pause.py b/cpgames/core/games/towerdefense/modules/interfaces/pause.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/pause.py rename to cpgames/core/games/towerdefense/modules/interfaces/pause.py diff --git a/cpgames/modules/core/towerdefense/modules/interfaces/start.py b/cpgames/core/games/towerdefense/modules/interfaces/start.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/interfaces/start.py rename to cpgames/core/games/towerdefense/modules/interfaces/start.py diff --git a/cpgames/modules/core/towerdefense/modules/sprites/__init__.py b/cpgames/core/games/towerdefense/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/sprites/__init__.py rename to cpgames/core/games/towerdefense/modules/sprites/__init__.py diff --git a/cpgames/modules/core/towerdefense/modules/sprites/arrow.py b/cpgames/core/games/towerdefense/modules/sprites/arrow.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/sprites/arrow.py rename to cpgames/core/games/towerdefense/modules/sprites/arrow.py diff --git a/cpgames/modules/core/towerdefense/modules/sprites/enemy.py b/cpgames/core/games/towerdefense/modules/sprites/enemy.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/sprites/enemy.py rename to cpgames/core/games/towerdefense/modules/sprites/enemy.py diff --git a/cpgames/modules/core/towerdefense/modules/sprites/turret.py b/cpgames/core/games/towerdefense/modules/sprites/turret.py similarity index 100% rename from cpgames/modules/core/towerdefense/modules/sprites/turret.py rename to cpgames/core/games/towerdefense/modules/sprites/turret.py diff --git a/cpgames/modules/core/towerdefense/resources/difficulties/easy.json b/cpgames/core/games/towerdefense/resources/difficulties/easy.json similarity index 100% rename from cpgames/modules/core/towerdefense/resources/difficulties/easy.json rename to cpgames/core/games/towerdefense/resources/difficulties/easy.json diff --git a/cpgames/modules/core/towerdefense/resources/difficulties/hard.json b/cpgames/core/games/towerdefense/resources/difficulties/hard.json similarity index 100% rename from cpgames/modules/core/towerdefense/resources/difficulties/hard.json rename to cpgames/core/games/towerdefense/resources/difficulties/hard.json diff --git a/cpgames/modules/core/towerdefense/resources/difficulties/medium.json b/cpgames/core/games/towerdefense/resources/difficulties/medium.json similarity index 100% rename from cpgames/modules/core/towerdefense/resources/difficulties/medium.json rename to cpgames/core/games/towerdefense/resources/difficulties/medium.json diff --git a/cpgames/modules/core/towerdefense/resources/fonts/Calibri.ttf b/cpgames/core/games/towerdefense/resources/fonts/Calibri.ttf similarity index 100% rename from cpgames/modules/core/towerdefense/resources/fonts/Calibri.ttf rename to cpgames/core/games/towerdefense/resources/fonts/Calibri.ttf diff --git a/cpgames/modules/core/towerdefense/resources/fonts/m04.ttf b/cpgames/core/games/towerdefense/resources/fonts/m04.ttf similarity index 100% rename from cpgames/modules/core/towerdefense/resources/fonts/m04.ttf rename to cpgames/core/games/towerdefense/resources/fonts/m04.ttf diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/load_game.png b/cpgames/core/games/towerdefense/resources/images/choice/load_game.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/load_game.png rename to cpgames/core/games/towerdefense/resources/images/choice/load_game.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map1.png b/cpgames/core/games/towerdefense/resources/images/choice/map1.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map1.png rename to cpgames/core/games/towerdefense/resources/images/choice/map1.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map1_black.png b/cpgames/core/games/towerdefense/resources/images/choice/map1_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map1_black.png rename to cpgames/core/games/towerdefense/resources/images/choice/map1_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map1_red.png b/cpgames/core/games/towerdefense/resources/images/choice/map1_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map1_red.png rename to cpgames/core/games/towerdefense/resources/images/choice/map1_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map2.png b/cpgames/core/games/towerdefense/resources/images/choice/map2.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map2.png rename to cpgames/core/games/towerdefense/resources/images/choice/map2.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map2_black.png b/cpgames/core/games/towerdefense/resources/images/choice/map2_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map2_black.png rename to cpgames/core/games/towerdefense/resources/images/choice/map2_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map2_red.png b/cpgames/core/games/towerdefense/resources/images/choice/map2_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map2_red.png rename to cpgames/core/games/towerdefense/resources/images/choice/map2_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map3.png b/cpgames/core/games/towerdefense/resources/images/choice/map3.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map3.png rename to cpgames/core/games/towerdefense/resources/images/choice/map3.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map3_black.png b/cpgames/core/games/towerdefense/resources/images/choice/map3_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map3_black.png rename to cpgames/core/games/towerdefense/resources/images/choice/map3_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/choice/map3_red.png b/cpgames/core/games/towerdefense/resources/images/choice/map3_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/choice/map3_red.png rename to cpgames/core/games/towerdefense/resources/images/choice/map3_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/end/continue_black.png b/cpgames/core/games/towerdefense/resources/images/end/continue_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/end/continue_black.png rename to cpgames/core/games/towerdefense/resources/images/end/continue_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/end/continue_red.png b/cpgames/core/games/towerdefense/resources/images/end/continue_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/end/continue_red.png rename to cpgames/core/games/towerdefense/resources/images/end/continue_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/end/gameover.png b/cpgames/core/games/towerdefense/resources/images/end/gameover.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/end/gameover.png rename to cpgames/core/games/towerdefense/resources/images/end/gameover.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/arrow1.png b/cpgames/core/games/towerdefense/resources/images/game/arrow1.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/arrow1.png rename to cpgames/core/games/towerdefense/resources/images/game/arrow1.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/arrow2.png b/cpgames/core/games/towerdefense/resources/images/game/arrow2.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/arrow2.png rename to cpgames/core/games/towerdefense/resources/images/game/arrow2.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/arrow3.png b/cpgames/core/games/towerdefense/resources/images/game/arrow3.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/arrow3.png rename to cpgames/core/games/towerdefense/resources/images/game/arrow3.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/basic_tower.png b/cpgames/core/games/towerdefense/resources/images/game/basic_tower.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/basic_tower.png rename to cpgames/core/games/towerdefense/resources/images/game/basic_tower.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/boulder.png b/cpgames/core/games/towerdefense/resources/images/game/boulder.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/boulder.png rename to cpgames/core/games/towerdefense/resources/images/game/boulder.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/bush.png b/cpgames/core/games/towerdefense/resources/images/game/bush.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/bush.png rename to cpgames/core/games/towerdefense/resources/images/game/bush.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/cave.png b/cpgames/core/games/towerdefense/resources/images/game/cave.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/cave.png rename to cpgames/core/games/towerdefense/resources/images/game/cave.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/dirt.png b/cpgames/core/games/towerdefense/resources/images/game/dirt.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/dirt.png rename to cpgames/core/games/towerdefense/resources/images/game/dirt.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/enemy_blue.png b/cpgames/core/games/towerdefense/resources/images/game/enemy_blue.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/enemy_blue.png rename to cpgames/core/games/towerdefense/resources/images/game/enemy_blue.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/enemy_pink.png b/cpgames/core/games/towerdefense/resources/images/game/enemy_pink.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/enemy_pink.png rename to cpgames/core/games/towerdefense/resources/images/game/enemy_pink.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/enemy_red.png b/cpgames/core/games/towerdefense/resources/images/game/enemy_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/enemy_red.png rename to cpgames/core/games/towerdefense/resources/images/game/enemy_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/enemy_yellow.png b/cpgames/core/games/towerdefense/resources/images/game/enemy_yellow.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/enemy_yellow.png rename to cpgames/core/games/towerdefense/resources/images/game/enemy_yellow.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/godark.png b/cpgames/core/games/towerdefense/resources/images/game/godark.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/godark.png rename to cpgames/core/games/towerdefense/resources/images/game/godark.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/golight.png b/cpgames/core/games/towerdefense/resources/images/game/golight.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/golight.png rename to cpgames/core/games/towerdefense/resources/images/game/golight.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/grass.png b/cpgames/core/games/towerdefense/resources/images/game/grass.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/grass.png rename to cpgames/core/games/towerdefense/resources/images/game/grass.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/healthfont.png b/cpgames/core/games/towerdefense/resources/images/game/healthfont.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/healthfont.png rename to cpgames/core/games/towerdefense/resources/images/game/healthfont.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/heavy_tower.png b/cpgames/core/games/towerdefense/resources/images/game/heavy_tower.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/heavy_tower.png rename to cpgames/core/games/towerdefense/resources/images/game/heavy_tower.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/med_tower.png b/cpgames/core/games/towerdefense/resources/images/game/med_tower.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/med_tower.png rename to cpgames/core/games/towerdefense/resources/images/game/med_tower.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/nexus.png b/cpgames/core/games/towerdefense/resources/images/game/nexus.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/nexus.png rename to cpgames/core/games/towerdefense/resources/images/game/nexus.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/othergrass.png b/cpgames/core/games/towerdefense/resources/images/game/othergrass.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/othergrass.png rename to cpgames/core/games/towerdefense/resources/images/game/othergrass.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/path.png b/cpgames/core/games/towerdefense/resources/images/game/path.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/path.png rename to cpgames/core/games/towerdefense/resources/images/game/path.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/rock.png b/cpgames/core/games/towerdefense/resources/images/game/rock.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/rock.png rename to cpgames/core/games/towerdefense/resources/images/game/rock.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/tiles.png b/cpgames/core/games/towerdefense/resources/images/game/tiles.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/tiles.png rename to cpgames/core/games/towerdefense/resources/images/game/tiles.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/unitfont.png b/cpgames/core/games/towerdefense/resources/images/game/unitfont.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/unitfont.png rename to cpgames/core/games/towerdefense/resources/images/game/unitfont.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/water.png b/cpgames/core/games/towerdefense/resources/images/game/water.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/water.png rename to cpgames/core/games/towerdefense/resources/images/game/water.png diff --git a/cpgames/modules/core/towerdefense/resources/images/game/x.png b/cpgames/core/games/towerdefense/resources/images/game/x.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/game/x.png rename to cpgames/core/games/towerdefense/resources/images/game/x.png diff --git a/cpgames/modules/core/towerdefense/resources/images/pause/gamepaused.png b/cpgames/core/games/towerdefense/resources/images/pause/gamepaused.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/pause/gamepaused.png rename to cpgames/core/games/towerdefense/resources/images/pause/gamepaused.png diff --git a/cpgames/modules/core/towerdefense/resources/images/pause/resume_black.png b/cpgames/core/games/towerdefense/resources/images/pause/resume_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/pause/resume_black.png rename to cpgames/core/games/towerdefense/resources/images/pause/resume_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/pause/resume_red.png b/cpgames/core/games/towerdefense/resources/images/pause/resume_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/pause/resume_red.png rename to cpgames/core/games/towerdefense/resources/images/pause/resume_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/start/play_black.png b/cpgames/core/games/towerdefense/resources/images/start/play_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/start/play_black.png rename to cpgames/core/games/towerdefense/resources/images/start/play_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/start/play_red.png b/cpgames/core/games/towerdefense/resources/images/start/play_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/start/play_red.png rename to cpgames/core/games/towerdefense/resources/images/start/play_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/start/quit_black.png b/cpgames/core/games/towerdefense/resources/images/start/quit_black.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/start/quit_black.png rename to cpgames/core/games/towerdefense/resources/images/start/quit_black.png diff --git a/cpgames/modules/core/towerdefense/resources/images/start/quit_red.png b/cpgames/core/games/towerdefense/resources/images/start/quit_red.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/start/quit_red.png rename to cpgames/core/games/towerdefense/resources/images/start/quit_red.png diff --git a/cpgames/modules/core/towerdefense/resources/images/start/start_interface.png b/cpgames/core/games/towerdefense/resources/images/start/start_interface.png similarity index 100% rename from cpgames/modules/core/towerdefense/resources/images/start/start_interface.png rename to cpgames/core/games/towerdefense/resources/images/start/start_interface.png diff --git a/cpgames/modules/core/towerdefense/resources/maps/1.map b/cpgames/core/games/towerdefense/resources/maps/1.map similarity index 100% rename from cpgames/modules/core/towerdefense/resources/maps/1.map rename to cpgames/core/games/towerdefense/resources/maps/1.map diff --git a/cpgames/modules/core/towerdefense/resources/maps/2.map b/cpgames/core/games/towerdefense/resources/maps/2.map similarity index 100% rename from cpgames/modules/core/towerdefense/resources/maps/2.map rename to cpgames/core/games/towerdefense/resources/maps/2.map diff --git a/cpgames/modules/core/towerdefense/resources/maps/3.map b/cpgames/core/games/towerdefense/resources/maps/3.map similarity index 100% rename from cpgames/modules/core/towerdefense/resources/maps/3.map rename to cpgames/core/games/towerdefense/resources/maps/3.map diff --git a/cpgames/modules/core/towerdefense/towerdefense.py b/cpgames/core/games/towerdefense/towerdefense.py similarity index 100% rename from cpgames/modules/core/towerdefense/towerdefense.py rename to cpgames/core/games/towerdefense/towerdefense.py diff --git a/cpgames/modules/core/trexrush/__init__.py b/cpgames/core/games/trexrush/__init__.py similarity index 100% rename from cpgames/modules/core/trexrush/__init__.py rename to cpgames/core/games/trexrush/__init__.py diff --git a/cpgames/modules/core/trexrush/modules/__init__.py b/cpgames/core/games/trexrush/modules/__init__.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/__init__.py rename to cpgames/core/games/trexrush/modules/__init__.py diff --git a/cpgames/modules/core/trexrush/modules/interfaces/__init__.py b/cpgames/core/games/trexrush/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/interfaces/__init__.py rename to cpgames/core/games/trexrush/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/trexrush/modules/interfaces/endinterface.py b/cpgames/core/games/trexrush/modules/interfaces/endinterface.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/interfaces/endinterface.py rename to cpgames/core/games/trexrush/modules/interfaces/endinterface.py diff --git a/cpgames/modules/core/trexrush/modules/interfaces/startinterface.py b/cpgames/core/games/trexrush/modules/interfaces/startinterface.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/interfaces/startinterface.py rename to cpgames/core/games/trexrush/modules/interfaces/startinterface.py diff --git a/cpgames/modules/core/trexrush/modules/sprites/__init__.py b/cpgames/core/games/trexrush/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/sprites/__init__.py rename to cpgames/core/games/trexrush/modules/sprites/__init__.py diff --git a/cpgames/modules/core/trexrush/modules/sprites/dinosaur.py b/cpgames/core/games/trexrush/modules/sprites/dinosaur.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/sprites/dinosaur.py rename to cpgames/core/games/trexrush/modules/sprites/dinosaur.py diff --git a/cpgames/modules/core/trexrush/modules/sprites/obstacle.py b/cpgames/core/games/trexrush/modules/sprites/obstacle.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/sprites/obstacle.py rename to cpgames/core/games/trexrush/modules/sprites/obstacle.py diff --git a/cpgames/modules/core/trexrush/modules/sprites/scene.py b/cpgames/core/games/trexrush/modules/sprites/scene.py similarity index 100% rename from cpgames/modules/core/trexrush/modules/sprites/scene.py rename to cpgames/core/games/trexrush/modules/sprites/scene.py diff --git a/cpgames/modules/core/trexrush/resources/audios/die.wav b/cpgames/core/games/trexrush/resources/audios/die.wav similarity index 100% rename from cpgames/modules/core/trexrush/resources/audios/die.wav rename to cpgames/core/games/trexrush/resources/audios/die.wav diff --git a/cpgames/modules/core/trexrush/resources/audios/jump.wav b/cpgames/core/games/trexrush/resources/audios/jump.wav similarity index 100% rename from cpgames/modules/core/trexrush/resources/audios/jump.wav rename to cpgames/core/games/trexrush/resources/audios/jump.wav diff --git a/cpgames/modules/core/trexrush/resources/audios/point.wav b/cpgames/core/games/trexrush/resources/audios/point.wav similarity index 100% rename from cpgames/modules/core/trexrush/resources/audios/point.wav rename to cpgames/core/games/trexrush/resources/audios/point.wav diff --git a/cpgames/modules/core/trexrush/resources/images/cacti-big.png b/cpgames/core/games/trexrush/resources/images/cacti-big.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/cacti-big.png rename to cpgames/core/games/trexrush/resources/images/cacti-big.png diff --git a/cpgames/modules/core/trexrush/resources/images/cacti-small.png b/cpgames/core/games/trexrush/resources/images/cacti-small.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/cacti-small.png rename to cpgames/core/games/trexrush/resources/images/cacti-small.png diff --git a/cpgames/modules/core/trexrush/resources/images/cloud.png b/cpgames/core/games/trexrush/resources/images/cloud.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/cloud.png rename to cpgames/core/games/trexrush/resources/images/cloud.png diff --git a/cpgames/modules/core/trexrush/resources/images/dino.png b/cpgames/core/games/trexrush/resources/images/dino.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/dino.png rename to cpgames/core/games/trexrush/resources/images/dino.png diff --git a/cpgames/modules/core/trexrush/resources/images/dino_ducking.png b/cpgames/core/games/trexrush/resources/images/dino_ducking.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/dino_ducking.png rename to cpgames/core/games/trexrush/resources/images/dino_ducking.png diff --git a/cpgames/modules/core/trexrush/resources/images/gameover.png b/cpgames/core/games/trexrush/resources/images/gameover.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/gameover.png rename to cpgames/core/games/trexrush/resources/images/gameover.png diff --git a/cpgames/modules/core/trexrush/resources/images/ground.png b/cpgames/core/games/trexrush/resources/images/ground.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/ground.png rename to cpgames/core/games/trexrush/resources/images/ground.png diff --git a/cpgames/modules/core/trexrush/resources/images/numbers.png b/cpgames/core/games/trexrush/resources/images/numbers.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/numbers.png rename to cpgames/core/games/trexrush/resources/images/numbers.png diff --git a/cpgames/modules/core/trexrush/resources/images/offline-sprite-2x-black.png b/cpgames/core/games/trexrush/resources/images/offline-sprite-2x-black.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/offline-sprite-2x-black.png rename to cpgames/core/games/trexrush/resources/images/offline-sprite-2x-black.png diff --git a/cpgames/modules/core/trexrush/resources/images/ptera.png b/cpgames/core/games/trexrush/resources/images/ptera.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/ptera.png rename to cpgames/core/games/trexrush/resources/images/ptera.png diff --git a/cpgames/modules/core/trexrush/resources/images/replay.png b/cpgames/core/games/trexrush/resources/images/replay.png similarity index 100% rename from cpgames/modules/core/trexrush/resources/images/replay.png rename to cpgames/core/games/trexrush/resources/images/replay.png diff --git a/cpgames/modules/core/trexrush/trexrush.py b/cpgames/core/games/trexrush/trexrush.py similarity index 100% rename from cpgames/modules/core/trexrush/trexrush.py rename to cpgames/core/games/trexrush/trexrush.py diff --git a/cpgames/modules/core/twentyfourpoint/__init__.py b/cpgames/core/games/twentyfourpoint/__init__.py similarity index 100% rename from cpgames/modules/core/twentyfourpoint/__init__.py rename to cpgames/core/games/twentyfourpoint/__init__.py diff --git a/cpgames/modules/core/twentyfourpoint/modules/__init__.py b/cpgames/core/games/twentyfourpoint/modules/__init__.py similarity index 100% rename from cpgames/modules/core/twentyfourpoint/modules/__init__.py rename to cpgames/core/games/twentyfourpoint/modules/__init__.py diff --git a/cpgames/modules/core/twentyfourpoint/modules/game.py b/cpgames/core/games/twentyfourpoint/modules/game.py similarity index 100% rename from cpgames/modules/core/twentyfourpoint/modules/game.py rename to cpgames/core/games/twentyfourpoint/modules/game.py diff --git a/cpgames/modules/core/twentyfourpoint/resources/audios/lose.wav b/cpgames/core/games/twentyfourpoint/resources/audios/lose.wav similarity index 100% rename from cpgames/modules/core/twentyfourpoint/resources/audios/lose.wav rename to cpgames/core/games/twentyfourpoint/resources/audios/lose.wav diff --git a/cpgames/modules/core/twentyfourpoint/resources/audios/warn.wav b/cpgames/core/games/twentyfourpoint/resources/audios/warn.wav similarity index 100% rename from cpgames/modules/core/twentyfourpoint/resources/audios/warn.wav rename to cpgames/core/games/twentyfourpoint/resources/audios/warn.wav diff --git a/cpgames/modules/core/twentyfourpoint/resources/audios/win.wav b/cpgames/core/games/twentyfourpoint/resources/audios/win.wav similarity index 100% rename from cpgames/modules/core/twentyfourpoint/resources/audios/win.wav rename to cpgames/core/games/twentyfourpoint/resources/audios/win.wav diff --git a/cpgames/modules/core/twentyfourpoint/twentyfourpoint.py b/cpgames/core/games/twentyfourpoint/twentyfourpoint.py similarity index 100% rename from cpgames/modules/core/twentyfourpoint/twentyfourpoint.py rename to cpgames/core/games/twentyfourpoint/twentyfourpoint.py diff --git a/cpgames/modules/core/twozerofoureight/__init__.py b/cpgames/core/games/twozerofoureight/__init__.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/__init__.py rename to cpgames/core/games/twozerofoureight/__init__.py diff --git a/cpgames/modules/core/twozerofoureight/modules/__init__.py b/cpgames/core/games/twozerofoureight/modules/__init__.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/modules/__init__.py rename to cpgames/core/games/twozerofoureight/modules/__init__.py diff --git a/cpgames/modules/core/twozerofoureight/modules/endinterface.py b/cpgames/core/games/twozerofoureight/modules/endinterface.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/modules/endinterface.py rename to cpgames/core/games/twozerofoureight/modules/endinterface.py diff --git a/cpgames/modules/core/twozerofoureight/modules/game2048.py b/cpgames/core/games/twozerofoureight/modules/game2048.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/modules/game2048.py rename to cpgames/core/games/twozerofoureight/modules/game2048.py diff --git a/cpgames/modules/core/twozerofoureight/modules/utils.py b/cpgames/core/games/twozerofoureight/modules/utils.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/modules/utils.py rename to cpgames/core/games/twozerofoureight/modules/utils.py diff --git a/cpgames/modules/core/twozerofoureight/resources/audios/bgm.mp3 b/cpgames/core/games/twozerofoureight/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/twozerofoureight/resources/audios/bgm.mp3 rename to cpgames/core/games/twozerofoureight/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/twozerofoureight/score b/cpgames/core/games/twozerofoureight/score similarity index 100% rename from cpgames/modules/core/twozerofoureight/score rename to cpgames/core/games/twozerofoureight/score diff --git a/cpgames/modules/core/twozerofoureight/twozerofoureight.py b/cpgames/core/games/twozerofoureight/twozerofoureight.py similarity index 100% rename from cpgames/modules/core/twozerofoureight/twozerofoureight.py rename to cpgames/core/games/twozerofoureight/twozerofoureight.py diff --git a/cpgames/modules/core/voicecontrolpikachu/__init__.py b/cpgames/core/games/voicecontrolpikachu/__init__.py similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/__init__.py rename to cpgames/core/games/voicecontrolpikachu/__init__.py diff --git a/cpgames/modules/core/voicecontrolpikachu/modules/__init__.py b/cpgames/core/games/voicecontrolpikachu/modules/__init__.py similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/modules/__init__.py rename to cpgames/core/games/voicecontrolpikachu/modules/__init__.py diff --git a/cpgames/modules/core/voicecontrolpikachu/modules/block.py b/cpgames/core/games/voicecontrolpikachu/modules/block.py similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/modules/block.py rename to cpgames/core/games/voicecontrolpikachu/modules/block.py diff --git a/cpgames/modules/core/voicecontrolpikachu/modules/pikachu.py b/cpgames/core/games/voicecontrolpikachu/modules/pikachu.py similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/modules/pikachu.py rename to cpgames/core/games/voicecontrolpikachu/modules/pikachu.py diff --git a/cpgames/modules/core/voicecontrolpikachu/resources/images/block.png b/cpgames/core/games/voicecontrolpikachu/resources/images/block.png similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/resources/images/block.png rename to cpgames/core/games/voicecontrolpikachu/resources/images/block.png diff --git a/cpgames/modules/core/voicecontrolpikachu/resources/images/pikachu.png b/cpgames/core/games/voicecontrolpikachu/resources/images/pikachu.png similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/resources/images/pikachu.png rename to cpgames/core/games/voicecontrolpikachu/resources/images/pikachu.png diff --git a/cpgames/modules/core/voicecontrolpikachu/voicecontrolpikachu.py b/cpgames/core/games/voicecontrolpikachu/voicecontrolpikachu.py similarity index 100% rename from cpgames/modules/core/voicecontrolpikachu/voicecontrolpikachu.py rename to cpgames/core/games/voicecontrolpikachu/voicecontrolpikachu.py diff --git a/cpgames/modules/core/whacamole/__init__.py b/cpgames/core/games/whacamole/__init__.py similarity index 100% rename from cpgames/modules/core/whacamole/__init__.py rename to cpgames/core/games/whacamole/__init__.py diff --git a/cpgames/modules/core/whacamole/modules/__init__.py b/cpgames/core/games/whacamole/modules/__init__.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/__init__.py rename to cpgames/core/games/whacamole/modules/__init__.py diff --git a/cpgames/modules/core/whacamole/modules/interfaces/__init__.py b/cpgames/core/games/whacamole/modules/interfaces/__init__.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/interfaces/__init__.py rename to cpgames/core/games/whacamole/modules/interfaces/__init__.py diff --git a/cpgames/modules/core/whacamole/modules/interfaces/endinterface.py b/cpgames/core/games/whacamole/modules/interfaces/endinterface.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/interfaces/endinterface.py rename to cpgames/core/games/whacamole/modules/interfaces/endinterface.py diff --git a/cpgames/modules/core/whacamole/modules/interfaces/startinterface.py b/cpgames/core/games/whacamole/modules/interfaces/startinterface.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/interfaces/startinterface.py rename to cpgames/core/games/whacamole/modules/interfaces/startinterface.py diff --git a/cpgames/modules/core/whacamole/modules/sprites/__init__.py b/cpgames/core/games/whacamole/modules/sprites/__init__.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/sprites/__init__.py rename to cpgames/core/games/whacamole/modules/sprites/__init__.py diff --git a/cpgames/modules/core/whacamole/modules/sprites/hammer.py b/cpgames/core/games/whacamole/modules/sprites/hammer.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/sprites/hammer.py rename to cpgames/core/games/whacamole/modules/sprites/hammer.py diff --git a/cpgames/modules/core/whacamole/modules/sprites/mole.py b/cpgames/core/games/whacamole/modules/sprites/mole.py similarity index 100% rename from cpgames/modules/core/whacamole/modules/sprites/mole.py rename to cpgames/core/games/whacamole/modules/sprites/mole.py diff --git a/cpgames/modules/core/whacamole/resources/audios/bgm.mp3 b/cpgames/core/games/whacamole/resources/audios/bgm.mp3 similarity index 100% rename from cpgames/modules/core/whacamole/resources/audios/bgm.mp3 rename to cpgames/core/games/whacamole/resources/audios/bgm.mp3 diff --git a/cpgames/modules/core/whacamole/resources/audios/count_down.wav b/cpgames/core/games/whacamole/resources/audios/count_down.wav similarity index 100% rename from cpgames/modules/core/whacamole/resources/audios/count_down.wav rename to cpgames/core/games/whacamole/resources/audios/count_down.wav diff --git a/cpgames/modules/core/whacamole/resources/audios/hammering.wav b/cpgames/core/games/whacamole/resources/audios/hammering.wav similarity index 100% rename from cpgames/modules/core/whacamole/resources/audios/hammering.wav rename to cpgames/core/games/whacamole/resources/audios/hammering.wav diff --git a/cpgames/modules/core/whacamole/resources/images/again1.png b/cpgames/core/games/whacamole/resources/images/again1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/again1.png rename to cpgames/core/games/whacamole/resources/images/again1.png diff --git a/cpgames/modules/core/whacamole/resources/images/again2.png b/cpgames/core/games/whacamole/resources/images/again2.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/again2.png rename to cpgames/core/games/whacamole/resources/images/again2.png diff --git a/cpgames/modules/core/whacamole/resources/images/background.png b/cpgames/core/games/whacamole/resources/images/background.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/background.png rename to cpgames/core/games/whacamole/resources/images/background.png diff --git a/cpgames/modules/core/whacamole/resources/images/begin.png b/cpgames/core/games/whacamole/resources/images/begin.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/begin.png rename to cpgames/core/games/whacamole/resources/images/begin.png diff --git a/cpgames/modules/core/whacamole/resources/images/begin1.png b/cpgames/core/games/whacamole/resources/images/begin1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/begin1.png rename to cpgames/core/games/whacamole/resources/images/begin1.png diff --git a/cpgames/modules/core/whacamole/resources/images/end.png b/cpgames/core/games/whacamole/resources/images/end.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/end.png rename to cpgames/core/games/whacamole/resources/images/end.png diff --git a/cpgames/modules/core/whacamole/resources/images/hammer0.png b/cpgames/core/games/whacamole/resources/images/hammer0.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/hammer0.png rename to cpgames/core/games/whacamole/resources/images/hammer0.png diff --git a/cpgames/modules/core/whacamole/resources/images/hammer1.png b/cpgames/core/games/whacamole/resources/images/hammer1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/hammer1.png rename to cpgames/core/games/whacamole/resources/images/hammer1.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_1.png b/cpgames/core/games/whacamole/resources/images/mole_1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_1.png rename to cpgames/core/games/whacamole/resources/images/mole_1.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_laugh1.png b/cpgames/core/games/whacamole/resources/images/mole_laugh1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_laugh1.png rename to cpgames/core/games/whacamole/resources/images/mole_laugh1.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_laugh2.png b/cpgames/core/games/whacamole/resources/images/mole_laugh2.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_laugh2.png rename to cpgames/core/games/whacamole/resources/images/mole_laugh2.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_laugh3.png b/cpgames/core/games/whacamole/resources/images/mole_laugh3.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_laugh3.png rename to cpgames/core/games/whacamole/resources/images/mole_laugh3.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_thump1.png b/cpgames/core/games/whacamole/resources/images/mole_thump1.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_thump1.png rename to cpgames/core/games/whacamole/resources/images/mole_thump1.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_thump2.png b/cpgames/core/games/whacamole/resources/images/mole_thump2.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_thump2.png rename to cpgames/core/games/whacamole/resources/images/mole_thump2.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_thump3.png b/cpgames/core/games/whacamole/resources/images/mole_thump3.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_thump3.png rename to cpgames/core/games/whacamole/resources/images/mole_thump3.png diff --git a/cpgames/modules/core/whacamole/resources/images/mole_thump4.png b/cpgames/core/games/whacamole/resources/images/mole_thump4.png similarity index 100% rename from cpgames/modules/core/whacamole/resources/images/mole_thump4.png rename to cpgames/core/games/whacamole/resources/images/mole_thump4.png diff --git a/cpgames/modules/core/whacamole/score.rec b/cpgames/core/games/whacamole/score.rec similarity index 100% rename from cpgames/modules/core/whacamole/score.rec rename to cpgames/core/games/whacamole/score.rec diff --git a/cpgames/modules/core/whacamole/whacamole.py b/cpgames/core/games/whacamole/whacamole.py similarity index 100% rename from cpgames/modules/core/whacamole/whacamole.py rename to cpgames/core/games/whacamole/whacamole.py diff --git a/cpgames/modules/utils/__init__.py b/cpgames/core/utils/__init__.py similarity index 100% rename from cpgames/modules/utils/__init__.py rename to cpgames/core/utils/__init__.py diff --git a/cpgames/modules/utils/initialize.py b/cpgames/core/utils/initialize.py similarity index 100% rename from cpgames/modules/utils/initialize.py rename to cpgames/core/utils/initialize.py diff --git a/cpgames/modules/utils/io.py b/cpgames/core/utils/io.py similarity index 100% rename from cpgames/modules/utils/io.py rename to cpgames/core/utils/io.py diff --git a/cpgames/modules/utils/misc.py b/cpgames/core/utils/misc.py similarity index 100% rename from cpgames/modules/utils/misc.py rename to cpgames/core/utils/misc.py diff --git a/cpgames/cpgames.py b/cpgames/cpgames.py index 1b9bb7d..28ad246 100644 --- a/cpgames/cpgames.py +++ b/cpgames/cpgames.py @@ -10,9 +10,9 @@ import warnings from PyQt5.QtWidgets import QApplication if __name__ == '__main__': - from modules import * + from core import * else: - from .modules import * + from .core import * warnings.filterwarnings('ignore') @@ -58,6 +58,7 @@ def initialize(self): 'greedysnake': GreedySnakeGame, 'puzzlepieces': PuzzlePiecesGame, 'towerdefense': TowerDefenseGame, + 'bloodfootball': BloodFootballGame, 'alieninvasion': AlienInvasionGame, 'breakoutclone': BreakoutcloneGame, 'twentyfourpoint': TwentyfourPointGame, diff --git a/cpgames/modules/components/__init__.py b/cpgames/modules/components/__init__.py deleted file mode 100644 index cd4678a..0000000 --- a/cpgames/modules/components/__init__.py +++ /dev/null @@ -1 +0,0 @@ -'''initialize''' \ No newline at end of file diff --git a/docs/Changelog.md b/docs/Changelog.md index 8d3d41e..61ab7b0 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -8,4 +8,9 @@ #### 2022-03-21 - 版本号: v0.1.1, -- 更新内容: 集成了半成品魔塔小游戏, 修复了Linux下运行存在的字体导入BUG。 \ No newline at end of file +- 更新内容: 集成了半成品魔塔小游戏, 修复了Linux下运行存在的字体导入BUG。 + +#### 2022-04-25 + +- 版本号: v0.1.2, +- 更新内容: 添加了热血足球小游戏。 \ No newline at end of file diff --git a/docs/Quickstart.md b/docs/Quickstart.md index fbf7c57..bcd46f4 100644 --- a/docs/Quickstart.md +++ b/docs/Quickstart.md @@ -408,6 +408,36 @@ game_client = cpgames.CPGames() game_client.execute('flipcardbymemory') ``` +#### 魔塔小游戏 + +**1.公众号文章链接** + +[点击查看]() + +**2.调用示例代码** + +```python +from cpgames import cpgames + +game_client = cpgames.CPGames() +game_client.execute('magictower') +``` + +#### 热血足球小游戏 + +**1.公众号文章链接** + +[点击查看]() + +**2.调用示例代码** + +```python +from cpgames import cpgames + +game_client = cpgames.CPGames() +game_client.execute('bloodfootball') +``` + ## 随机运行一个小游戏 diff --git a/setup.py b/setup.py index 956916b..042a945 100644 --- a/setup.py +++ b/setup.py @@ -19,36 +19,37 @@ '''package data''' package_data = { - 'cpgames.modules.core.base': ['resources/fonts/*', 'resources/audios/*'], - 'cpgames.modules.core.aircraftwar': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.alieninvasion': ['resources/*'], - 'cpgames.modules.core.angrybirds': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], - 'cpgames.modules.core.bomberman': ['resources/audios/*', 'resources/maps/*', 'resources/images/batman/*', 'resources/images/dk/*', 'resources/images/misc/*', 'resources/images/zelda/*'], - 'cpgames.modules.core.breakoutclone': ['resources/audios/*', 'resources/levels/*'], - 'cpgames.modules.core.bunnybadger': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.catchcoins': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.flappybird': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.flipcardbymemory': ['resources/audios/*', 'resources/images/series1/*', 'resources/images/series2/*', 'resources/images/series3/*'], - 'cpgames.modules.core.gemgem': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.gobang': ['resources/audios/*', 'resources/images/bg/*', 'resources/images/buttons/*', 'resources/images/chessman/*', 'resources/images/icon/*', 'resources/images/win/*'], - 'cpgames.modules.core.greedysnake': ['resources/audios/*'], - 'cpgames.modules.core.maze': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.minesweeper': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], - 'cpgames.modules.core.pacman': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], - 'cpgames.modules.core.pingpong': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.puzzlepieces': ['resources/images/*'], - 'cpgames.modules.core.ski': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.sokoban': ['resources/audios/*', 'resources/images/*', 'resources/levels/*'], - 'cpgames.modules.core.tankwar': ['resources/audios/*', 'resources/images/bullet/*', 'resources/images/enemyTank/*', 'resources/images/food/*', 'resources/images/home/*', 'resources/images/others/*', 'resources/images/playerTank/*', 'resources/images/scene/*'], - 'cpgames.modules.core.tankwar.modules': ['levels/*'], - 'cpgames.modules.core.tetris': ['resources/*'], - 'cpgames.modules.core.towerdefense': ['resources/audios/*', 'resources/fonts/*', 'resources/maps/*', 'resources/difficulties/*', 'resources/images/choice/*', 'resources/images/end/*', 'resources/images/game/*', 'resources/images/pause/*', 'resources/images/start/*'], - 'cpgames.modules.core.trexrush': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.twentyfourpoint': ['resources/audios/*'], - 'cpgames.modules.core.twozerofoureight': ['resources/audios/*'], - 'cpgames.modules.core.voicecontrolpikachu': ['resources/images/*'], - 'cpgames.modules.core.whacamole': ['resources/audios/*', 'resources/images/*'], - 'cpgames.modules.core.magictower': ['resources/images/*', 'resources/levels/*', 'resources/fonts/*', 'resources/images/map0/*', 'resources/images/map1/*', 'resources/images/player/*'], + 'cpgames.core.games.base': ['resources/fonts/*', 'resources/audios/*'], + 'cpgames.core.games.aircraftwar': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.alieninvasion': ['resources/*'], + 'cpgames.core.games.angrybirds': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], + 'cpgames.core.games.bomberman': ['resources/audios/*', 'resources/maps/*', 'resources/images/batman/*', 'resources/images/dk/*', 'resources/images/misc/*', 'resources/images/zelda/*'], + 'cpgames.core.games.breakoutclone': ['resources/audios/*', 'resources/levels/*'], + 'cpgames.core.games.bunnybadger': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.catchcoins': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.flappybird': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.flipcardbymemory': ['resources/audios/*', 'resources/images/series1/*', 'resources/images/series2/*', 'resources/images/series3/*'], + 'cpgames.core.games.gemgem': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.gobang': ['resources/audios/*', 'resources/images/bg/*', 'resources/images/buttons/*', 'resources/images/chessman/*', 'resources/images/icon/*', 'resources/images/win/*'], + 'cpgames.core.games.greedysnake': ['resources/audios/*'], + 'cpgames.core.games.maze': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.minesweeper': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], + 'cpgames.core.games.pacman': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'], + 'cpgames.core.games.pingpong': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.puzzlepieces': ['resources/images/*'], + 'cpgames.core.games.ski': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.sokoban': ['resources/audios/*', 'resources/images/*', 'resources/levels/*'], + 'cpgames.core.games.tankwar': ['resources/audios/*', 'resources/images/bullet/*', 'resources/images/enemyTank/*', 'resources/images/food/*', 'resources/images/home/*', 'resources/images/others/*', 'resources/images/playerTank/*', 'resources/images/scene/*'], + 'cpgames.core.games.tankwar.modules': ['levels/*'], + 'cpgames.core.games.tetris': ['resources/*'], + 'cpgames.core.games.towerdefense': ['resources/audios/*', 'resources/fonts/*', 'resources/maps/*', 'resources/difficulties/*', 'resources/images/choice/*', 'resources/images/end/*', 'resources/images/game/*', 'resources/images/pause/*', 'resources/images/start/*'], + 'cpgames.core.games.trexrush': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.twentyfourpoint': ['resources/audios/*'], + 'cpgames.core.games.twozerofoureight': ['resources/audios/*'], + 'cpgames.core.games.voicecontrolpikachu': ['resources/images/*'], + 'cpgames.core.games.whacamole': ['resources/audios/*', 'resources/images/*'], + 'cpgames.core.games.magictower': ['resources/images/*', 'resources/levels/*', 'resources/fonts/*', 'resources/images/map0/*', 'resources/images/map1/*', 'resources/images/player/*'], + 'cpgames.core.games.bloodfootball': ['resources/images/*', 'resources/audios/*'], }