diff --git a/config/routes/athena.yaml b/config/routes/athena.yaml
index 3cd681632..d69142735 100644
--- a/config/routes/athena.yaml
+++ b/config/routes/athena.yaml
@@ -19,7 +19,15 @@ base_overview:
 
 generator:
     path: /generator
-    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\RefineryController
+    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\ViewGenerator
+
+build:
+    path: /buildings/{identifier}/build
+    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\Build
+
+cancel_building_queue:
+    path: /building-queues/{identifier}/cancel
+    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\Cancel
 
 refinery:
     path: /refinery
diff --git a/src/Modules/Athena/Infrastructure/Controller/Base/Building/Build.php b/src/Modules/Athena/Infrastructure/Controller/Base/Building/Build.php
new file mode 100644
index 000000000..02b2671a5
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Base/Building/Build.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Base\Building;
+
+use App\Classes\Library\Utils;
+use App\Modules\Athena\Helper\OrbitalBaseHelper;
+use App\Modules\Athena\Manager\BuildingQueueManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\BuildingQueue;
+use App\Modules\Athena\Model\OrbitalBase;
+use App\Modules\Athena\Resource\OrbitalBaseResource;
+use App\Modules\Promethee\Manager\TechnologyManager;
+use App\Modules\Zeus\Helper\TutorialHelper;
+use App\Modules\Zeus\Model\Player;
+use App\Modules\Zeus\Model\PlayerBonus;
+use App\Modules\Zeus\Resource\TutorialResource;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+
+class Build extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		OrbitalBase $currentBase,
+		OrbitalBaseHelper $orbitalBaseHelper,
+		OrbitalBaseManager $orbitalBaseManager,
+		TechnologyManager $technologyManager,
+		BuildingQueueManager $buildingQueueManager,
+		TutorialHelper $tutorialHelper,
+		int $identifier,
+	): Response {
+		if ($orbitalBaseHelper->isABuilding($identifier)) {
+			$buildingQueues = $buildingQueueManager->getBaseQueues($currentBase->getId());
+
+			$currentLevel = call_user_func(array($currentBase, 'getReal' . ucfirst($orbitalBaseHelper->getBuildingInfo($identifier, 'name')) . 'Level'));
+			$technos = $technologyManager->getPlayerTechnology($currentPlayer->getId());
+			dump(
+				$identifier,
+				$orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'resource', $currentBase->getResourcesStorage()),
+				$orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $currentBase->getLevelGenerator(), 'queue', count($buildingQueues)),
+				$orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'buildingTree', $currentBase),
+				$orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'techno', $technos)
+			);
+
+			if ($orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'resource', $currentBase->getResourcesStorage())
+				AND $orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $currentBase->getLevelGenerator(), 'queue', count($buildingQueues))
+				AND ($orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'buildingTree', $currentBase) === TRUE)
+				AND $orbitalBaseHelper->haveRights($identifier, $currentLevel + 1, 'techno', $technos)) {
+
+				# tutorial
+				if ($currentPlayer->stepDone == FALSE) {
+					switch ($currentPlayer->getStepTutorial()) {
+						case TutorialResource::GENERATOR_LEVEL_2:
+							if ($identifier == OrbitalBaseResource::GENERATOR AND $currentLevel + 1 >= 2) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::REFINERY_LEVEL_3:
+							if ($identifier == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 3) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::STORAGE_LEVEL_3:
+							if ($identifier == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 3) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::DOCK1_LEVEL_1:
+							if ($identifier == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 1) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::TECHNOSPHERE_LEVEL_1:
+							if ($identifier == OrbitalBaseResource::TECHNOSPHERE AND $currentLevel + 1 >= 1) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::REFINERY_LEVEL_10:
+							if ($identifier == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 10) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::STORAGE_LEVEL_8:
+							if ($identifier == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 8) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::DOCK1_LEVEL_6:
+							if ($identifier == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 6) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::REFINERY_LEVEL_16:
+							if ($identifier == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 16) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::STORAGE_LEVEL_12:
+							if ($identifier == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 12) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::TECHNOSPHERE_LEVEL_6:
+							if ($identifier == OrbitalBaseResource::TECHNOSPHERE AND $currentLevel + 1 >= 6) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::DOCK1_LEVEL_15:
+							if ($identifier == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 15) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+						case TutorialResource::REFINERY_LEVEL_20:
+							if ($identifier == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 20) {
+								$tutorialHelper->setStepDone();
+							}
+							break;
+					}
+				}
+
+				$session = $request->getSession();
+
+				# build the new building
+				$bq = new BuildingQueue();
+				$bq->rOrbitalBase = $currentBase->getId();
+				$bq->buildingNumber = $identifier;
+				$bq->targetLevel = $currentLevel + 1;
+				$time = $orbitalBaseHelper->getBuildingInfo($identifier, 'level', $currentLevel + 1, 'time');
+				$bonus = $time * $session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED) / 100;
+				$nbBuildingQueues = count($buildingQueues);
+				if ($nbBuildingQueues === 0) {
+					$bq->dStart = Utils::now();
+				} else {
+					$bq->dStart = $buildingQueues[$nbBuildingQueues - 1]->dEnd;
+				}
+				$bq->dEnd = Utils::addSecondsToDate($bq->dStart, round($time - $bonus));
+				$buildingQueueManager->add($bq);
+
+				# debit resources
+				$orbitalBaseManager->decreaseResources($currentBase, $orbitalBaseHelper->getBuildingInfo($identifier, 'level', $currentLevel + 1, 'resourcePrice'));
+
+//						if ($container->getParameter('data_analysis')) {
+//							$qr = $database->prepare('INSERT INTO
+//						DA_BaseAction(`from`, type, opt1, opt2, weight, dAction)
+//						VALUES(?, ?, ?, ?, ?, ?)'
+//							);
+//							$qr->execute([$session->get('playerId'), 1, $building, $currentLevel + 1, DataAnalysis::resourceToStdUnit($orbitalBaseHelper->getBuildingInfo($building, 'level', $currentLevel + 1, 'resourcePrice')), Utils::now()]);
+//						}
+
+				# add the event in controller
+				$session->get('playerEvent')->add($bq->dEnd, $this->getParameter('event_base'), $currentBase->getId());
+
+				$this->addFlash('success', 'Construction programmée');
+
+				return $this->redirect($request->headers->get('referer'));
+			} else {
+				throw new ConflictHttpException('les conditions ne sont pas remplies pour construire ce bâtiment');
+			}
+		} else {
+			throw new BadRequestHttpException('le bâtiment indiqué n\'est pas valide');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Base/Building/Cancel.php b/src/Modules/Athena/Infrastructure/Controller/Base/Building/Cancel.php
new file mode 100644
index 000000000..98cd016e3
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Base/Building/Cancel.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Base\Building;
+
+use App\Classes\Entity\EntityManager;
+use App\Classes\Library\Utils;
+use App\Modules\Athena\Helper\OrbitalBaseHelper;
+use App\Modules\Athena\Manager\BuildingQueueManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\BuildingQueue;
+use App\Modules\Athena\Model\OrbitalBase;
+use App\Modules\Zeus\Model\Player;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+
+class Cancel extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		OrbitalBase $currentBase,
+		OrbitalBaseHelper $orbitalBaseHelper,
+		OrbitalBaseManager $orbitalBaseManager,
+		BuildingQueueManager $buildingQueueManager,
+		EntityManager $entityManager,
+		int $identifier,
+	): Response {
+		if ($orbitalBaseHelper->isABuilding($identifier)) {
+			$buildingQueues = $buildingQueueManager->getBaseQueues($currentBase->getId());
+
+			$index = NULL;
+			$nbBuildingQueues = count($buildingQueues);
+			for ($i = 0; $i < $nbBuildingQueues; $i++) {
+				$queue = $buildingQueues[$i];
+				# get the last element from the correct building
+				if ($queue->buildingNumber == $identifier) {
+					$index = $i;
+					$targetLevel = $queue->targetLevel;
+					$dStart = $queue->dStart;
+				}
+			}
+
+			# if it's the first, the next must restart by now
+			if ($index == 0) {
+				$dStart = Utils::now();
+			}
+
+			if ($index !== NULL) {
+				# shift
+				for ($i = $index + 1; $i < $nbBuildingQueues; $i++) {
+					$queue = $buildingQueues[$i];
+
+					$oldDate = $queue->dEnd;
+					$queue->dEnd = Utils::addSecondsToDate($dStart, Utils::interval($queue->dStart, $queue->dEnd, 's'));
+					$queue->dStart = $dStart;
+
+					// @TODO handle rescheduling
+					// $scheduler->reschedule($queue, $queue->dEnd, $oldDate);
+
+					$dStart = $queue->dEnd;
+				}
+
+				// @TODO handle cancellation
+				// $scheduler->cancel($buildingQueues[$index], $buildingQueues[$index]->dEnd);
+				$entityManager->remove($buildingQueues[$index]);
+				$entityManager->flush(BuildingQueue::class);
+
+				$buildingResourceRefund = $this->getParameter('athena.building.building_queue_resource_refund');
+				// give the resources back
+				$resourcePrice = $orbitalBaseHelper->getBuildingInfo($identifier, 'level', $targetLevel, 'resourcePrice');
+				$resourcePrice *= $buildingResourceRefund;
+				$orbitalBaseManager->increaseResources($currentBase, $resourcePrice, TRUE);
+				$this->addFlash('success', 'Construction annulée, vous récupérez le ' . $buildingResourceRefund * 100 . '% du montant investi pour la construction');
+
+				return $this->redirect($request->headers->get('referer'));
+			} else {
+				throw new ConflictHttpException('suppression de bâtiment impossible');
+			}
+		} else {
+			throw new BadRequestHttpException('le bâtiment indiqué n\'est pas valide');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Base/Building/GeneratorController.php b/src/Modules/Athena/Infrastructure/Controller/Base/Building/GeneratorController.php
deleted file mode 100644
index 012e17241..000000000
--- a/src/Modules/Athena/Infrastructure/Controller/Base/Building/GeneratorController.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace App\Modules\Athena\Infrastructure\Controller\Base\Building;
-
-use App\Classes\Library\Chronos;
-use App\Classes\Library\Format;
-use App\Classes\Library\Utils;
-use App\Modules\Athena\Helper\OrbitalBaseHelper;
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-use App\Modules\Promethee\Manager\TechnologyManager;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class GeneratorController extends AbstractController
-{
-	public function __invoke(
-		Request $request,
-		OrbitalBaseHelper $orbitalBaseHelper,
-		TechnologyManager $technologyManager,
-		int $buildingResourceRefund,
-	): Response {
-		$session = $request->getSession();
-
-		$q = '';
-		$b = array('', '', '', '', '', '', '', '', '', '');
-		$realSizeQueue = 0;
-
-		for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-			$name 		= ucfirst($orbitalBaseHelper->getBuildingInfo($i, 'name'));
-			$aLevel[$i] = intval(call_user_func(array($ob_generator, 'getLevel' . $name)));
-			$rLevel[$i] = intval(call_user_func(array($ob_generator, 'getReal' . $name . 'Level')));
-		}
-
-		$q .= '<div class="queue">';
-		$nextTime = 0;
-		$nextTotalTime = 0;
-
-		for ($i = 0; $i < $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::GENERATOR, 'level', $ob_generator->levelGenerator, 'nbQueues'); $i++) {
-			if (isset($ob_generator->buildingQueues[$i])) {
-				$qe = $ob_generator->buildingQueues[$i];
-
-				$realSizeQueue++;
-				$nextTime = Utils::interval(Utils::now(), $qe->dEnd, 's');
-				$nextTotalTime += $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'level', $qe->targetLevel, 'time');
-
-				$q .= '<div class="item ' . (($realSizeQueue > 1) ? 'active' : '') . ' progress" data-progress-output="lite" data-progress-current-time="' . $nextTime . '" data-progress-total-time="' . $nextTotalTime . '">';
-				$q .= '<a href="' . Format::actionBuilder('dequeuebuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $qe->buildingNumber]) . '"' .
-					'class="button hb lt" title="annuler la construction (attention, vous ne récupérerez que ' . $buildingResourceRefund * 100 . '% du montant investi)">×</a>';
-				$q .= '<img class="picto" src="' . $mediaPath . 'orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'imageLink') . '.png" alt="" />';
-				$q .= '<strong>';
-				$q .= $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'frenchName');
-				$q .= ' <span class="level">niv. ' . $qe->targetLevel . '</span>';
-				$q .= '</strong>';
-				if ($realSizeQueue > 1) {
-					$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>';
-					$q .= '<span class="progress-container"></span>';
-				} else {
-					$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>';
-
-					$q .= '<span class="progress-container">';
-					$q .= '<span style="width: ' . Format::percent($nextTotalTime - $nextTime, $nextTotalTime) . '%;" class="progress-bar">';
-					$q .='</span>';
-					$q .= '</span>';
-				}
-				$q .= '</div>';
-			} else {
-				$q .= '<div class="item empty">';
-				$q .= '<span class="picto"></span>';
-				$q .= '<strong>Emplacement libre</strong>';
-				$q .= '<span class="progress-container"></span>';
-				$q .= '</div>';
-			}
-		}
-		$q .= '</div>';
-
-
-# building
-		$technology = $technologyManager->getPlayerTechnology($session->get('playerId'));
-		for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-			$level = $aLevel[$i];
-			$nextLevel =  $rLevel[$i] + 1;
-
-			$b[$i] .= ($rLevel[$i]) ? '<div class="build-item">' : '<div class="build-item disable">';
-			$b[$i] .= '<div class="name">';
-			$b[$i] .= '<img src="' . $mediaPath . 'orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($i, 'imageLink') . '.png" alt="" />';
-			$b[$i] .= '<strong>' . $orbitalBaseHelper->getBuildingInfo($i, 'frenchName') . '</strong>';
-			if ($level != 0) {
-				$b[$i] .= '<span class="level hb lt" title="niveau actuel">' . $level . '</span>';
-			}
-			$b[$i] .= '<a href="#" class="addInfoPanel info hb lt" title="plus d\'info" data-building-id="' . $i . '" data-info-type="building" data-building-current-level="' . $level . '">+</a>';
-			$b[$i] .= '</div>';
-
-			$price = Format::numberFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice'), -1) . ' <img src="' .  $mediaPath. 'resources/resource.png" alt="ressources" class="icon-color" />';
-			$time  = Chronos::secondToFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'time'), 'lite') . ' <img src="' .  $mediaPath. 'resources/time.png" alt="relèves" class="icon-color" />';
-
-			if (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'buildingTree', $ob_generator)) !== TRUE) {
-				if ($answer == 'niveau maximum atteint') {
-					$b[$i] .= '<span class="button disable">';
-					$b[$i] .= '<span class="text">';
-					$b[$i] .= 'construction impossible<br/>';
-					$b[$i] .= 'niveau maximum atteint';
-					$b[$i] .= '</span>';
-					$b[$i] .= '</span>';
-				} else {
-					$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">';
-					$b[$i] .= '<span class="text">';
-					$b[$i] .= 'construction impossible<br/>';
-					$b[$i] .= $price . ' | ' . $time;
-					$b[$i] .= '</span>';
-					$b[$i] .= '</span>';
-				}
-			} elseif (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'techno', $technology)) !== TRUE) {
-				$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">';
-				$b[$i] .= '<span class="text">';
-				$b[$i] .= 'construction impossible<br/>';
-				$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-				$b[$i] .= '</span>';
-			} elseif (!$orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $aLevel[OrbitalBaseResource::GENERATOR], 'queue', $realSizeQueue)) {
-				$b[$i] .= '<span class="button disable hb lt" title="file de construction pleine, revenez dans un moment">';
-				$b[$i] .= '<span class="text">';
-				$b[$i] .= 'construction impossible<br/>';
-				$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-				$b[$i] .= '</span>';
-			} elseif (!$orbitalBaseHelper->haveRights($i, $nextLevel, 'resource', $ob_generator->getResourcesStorage())) {
-				$missingResource = $orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice') - $ob_generator->getResourcesStorage();
-				$b[$i] .= '<span class="button disable hb lt" title="pas assez de ressources, il manque ' . Format::numberFormat($missingResource) . ' ressource' . Format::plural($missingResource) . '">';
-				$b[$i] .= '<span class="text">';
-				$b[$i] .= 'construction impossible<br/>';
-				$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-				$b[$i] .= '</span>';
-			} else {
-				$b[$i] .= '<a class="button" href="' . Format::actionBuilder('buildbuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $i]) . '">';
-				$b[$i] .= '<span class="text">';
-				$b[$i] .= 'augmenter vers le niveau ' . $nextLevel . '<br/>';
-				$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-				$b[$i] .= '</a>';
-			}
-			$b[$i] .= '</div>';
-		}
-		return $this->render('pages/athena/generator.html.twig', [
-			'buildings' => $b,
-		]);
-	}
-}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewGenerator.php b/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewGenerator.php
new file mode 100644
index 000000000..7b5d30db0
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewGenerator.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Base\Building;
+
+use App\Classes\Library\Chronos;
+use App\Classes\Library\Format;
+use App\Classes\Library\Utils;
+use App\Modules\Athena\Helper\OrbitalBaseHelper;
+use App\Modules\Athena\Model\OrbitalBase;
+use App\Modules\Athena\Resource\OrbitalBaseResource;
+use App\Modules\Promethee\Manager\TechnologyManager;
+use App\Modules\Promethee\Model\Technology;
+use App\Modules\Zeus\Model\Player;
+use App\Modules\Zeus\Model\PlayerBonus;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ViewGenerator extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		OrbitalBase $currentBase,
+		OrbitalBaseHelper $orbitalBaseHelper,
+		TechnologyManager $technologyManager,
+	): Response {
+		$session = $request->getSession();
+		$technology = $technologyManager->getPlayerTechnology($currentPlayer->getId());
+
+		return $this->render('pages/athena/generator.html.twig', [
+			'technology' => $technology,
+			'generator_speed_bonus' => $session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED),
+			'building_resource_refund' => $this->getParameter('athena.building.building_queue_resource_refund'),
+			'buildings_data' => $this->getBuildingsData($orbitalBaseHelper, $currentBase, $technology)
+		]);
+	}
+
+	private function getBuildingsData(
+		OrbitalBaseHelper $orbitalBaseHelper,
+		OrbitalBase $currentBase,
+		Technology $technology,
+	): array {
+		$data = [];
+		foreach (OrbitalBaseResource::$building as $buildingNumber => $buildingData) {
+			$level = $currentBase->{'getLevel' . $buildingData['name']}();
+			$realLevel = $currentBase->{'getReal' . $buildingData['name'] . 'Level'}();
+			$nextLevel =  $realLevel + 1;
+
+			$data[$buildingNumber] = [
+				'real_level' => $realLevel,
+				'next_level' => $nextLevel,
+				'level' => $level,
+				'building_requirements' => $orbitalBaseHelper->haveRights($buildingNumber, $nextLevel, 'buildingTree', $currentBase),
+				'technology_requirements' => $orbitalBaseHelper->haveRights($buildingNumber, $nextLevel, 'techno', $technology),
+				'queue_requirements' => $orbitalBaseHelper->haveRights(
+					OrbitalBaseResource::GENERATOR,
+					$currentBase->getLevelGenerator(),
+					'queue',
+					count($currentBase->buildingQueues,
+				)),
+				'resources_requirements' => $orbitalBaseHelper->haveRights($buildingNumber, $nextLevel, 'resource', $currentBase->getResourcesStorage()),
+			];
+		}
+
+		return $data;
+	}
+}
diff --git a/src/action/std/athena/building/build.php b/src/action/std/athena/building/build.php
deleted file mode 100755
index 9f2492374..000000000
--- a/src/action/std/athena/building/build.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-# building a building action
-
-# int baseid 		id de la base orbitale
-# int building 	 	id du bâtiment
-
-use App\Classes\Library\Utils;
-use App\Classes\Library\Flashbag;
-use App\Classes\Library\DataAnalysis;
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-use App\Modules\Zeus\Resource\TutorialResource;
-use App\Modules\Athena\Model\BuildingQueue;
-use App\Modules\Zeus\Model\PlayerBonus;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-
-$container = $this->getContainer();
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$database = $this->getContainer()->get(\App\Classes\Database\Database::class);
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$buildingQueueManager = $this->getContainer()->get(\App\Modules\Athena\Manager\BuildingQueueManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$technologyManager = $this->getContainer()->get(\App\Modules\Promethee\Manager\TechnologyManager::class);
-$tutorialHelper = $this->getContainer()->get(\App\Modules\Zeus\Helper\TutorialHelper::class);
-$request = $this->getContainer()->get('app.request');
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$baseId = $request->query->get('baseid');
-$building = $request->query->get('building');
-
-if ($baseId !== FALSE AND $building !== FALSE AND in_array($baseId, $verif)) {
-	if ($orbitalBaseHelper->isABuilding($building)) {
-		if (($ob = $orbitalBaseManager->getPlayerBase($baseId, $session->get('playerId'))) !== null) {
-			$buildingQueues = $buildingQueueManager->getBaseQueues($baseId);
-
-			$currentLevel = call_user_func(array($ob, 'getReal' . ucfirst($orbitalBaseHelper->getBuildingInfo($building, 'name')) . 'Level'));
-			$technos = $technologyManager->getPlayerTechnology($session->get('playerId'));
-			if ($orbitalBaseHelper->haveRights($building, $currentLevel + 1, 'resource', $ob->getResourcesStorage())
-				AND $orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $ob->getLevelGenerator(), 'queue', count($buildingQueues)) 
-				AND ($orbitalBaseHelper->haveRights($building, $currentLevel + 1, 'buildingTree', $ob) === TRUE)
-				AND $orbitalBaseHelper->haveRights($building, $currentLevel + 1, 'techno', $technos)) {
-
-				# tutorial
-				if ($session->get('playerInfo')->get('stepDone') == FALSE) {
-					switch ($session->get('playerInfo')->get('stepTutorial')) {
-						case TutorialResource::GENERATOR_LEVEL_2:
-							if ($building == OrbitalBaseResource::GENERATOR AND $currentLevel + 1 >= 2) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::REFINERY_LEVEL_3:
-							if ($building == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 3) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::STORAGE_LEVEL_3:
-							if ($building == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 3) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::DOCK1_LEVEL_1:
-							if ($building == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 1) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::TECHNOSPHERE_LEVEL_1:
-							if ($building == OrbitalBaseResource::TECHNOSPHERE AND $currentLevel + 1 >= 1) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::REFINERY_LEVEL_10:
-							if ($building == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 10) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::STORAGE_LEVEL_8:
-							if ($building == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 8) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::DOCK1_LEVEL_6:
-							if ($building == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 6) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::REFINERY_LEVEL_16:
-							if ($building == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 16) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::STORAGE_LEVEL_12:
-							if ($building == OrbitalBaseResource::STORAGE AND $currentLevel + 1 >= 12) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::TECHNOSPHERE_LEVEL_6:
-							if ($building == OrbitalBaseResource::TECHNOSPHERE AND $currentLevel + 1 >= 6) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::DOCK1_LEVEL_15:
-							if ($building == OrbitalBaseResource::DOCK1 AND $currentLevel + 1 >= 15) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-						case TutorialResource::REFINERY_LEVEL_20:
-							if ($building == OrbitalBaseResource::REFINERY AND $currentLevel + 1 >= 20) {
-								$tutorialHelper->setStepDone();
-							}
-							break;
-					}
-				}
-
-				# build the new building
-				$bq = new BuildingQueue();
-				$bq->rOrbitalBase = $baseId;
-				$bq->buildingNumber = $building;
-				$bq->targetLevel = $currentLevel + 1;
-				$time = $orbitalBaseHelper->getBuildingInfo($building, 'level', $currentLevel + 1, 'time');
-				$bonus = $time * $session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED) / 100;
-				$nbBuildingQueues = count($buildingQueues);
-				if ($nbBuildingQueues === 0) {
-					$bq->dStart = Utils::now();
-				} else {
-					$bq->dStart = $buildingQueues[$nbBuildingQueues - 1]->dEnd;
-				}
-				$bq->dEnd = Utils::addSecondsToDate($bq->dStart, round($time - $bonus));
-				$buildingQueueManager->add($bq);
-
-				# debit resources
-				$orbitalBaseManager->decreaseResources($ob, $orbitalBaseHelper->getBuildingInfo($building, 'level', $currentLevel + 1, 'resourcePrice'));
-
-				if ($container->getParameter('data_analysis')) {
-					$qr = $database->prepare('INSERT INTO 
-						DA_BaseAction(`from`, type, opt1, opt2, weight, dAction)
-						VALUES(?, ?, ?, ?, ?, ?)'
-					);
-					$qr->execute([$session->get('playerId'), 1, $building, $currentLevel + 1, DataAnalysis::resourceToStdUnit($orbitalBaseHelper->getBuildingInfo($building, 'level', $currentLevel + 1, 'resourcePrice')), Utils::now()]);
-				}
-
-				# add the event in controller
-				$session->get('playerEvent')->add($bq->dEnd, $container->getParameter('event_base'), $baseId);
-
-				$session->addFlashbag('Construction programmée', Flashbag::TYPE_SUCCESS);
-			} else {
-				throw new FormException('les conditions ne sont pas remplies pour construire ce bâtiment');
-			}
-		} else {
-			throw new ErrorException('cette base ne vous appartient pas');
-		}
-	} else {
-		throw new ErrorException('le bâtiment indiqué n\'est pas valide');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour construire un bâtiment');
-}
diff --git a/src/action/std/athena/building/dequeue.php b/src/action/std/athena/building/dequeue.php
deleted file mode 100755
index 613ea677c..000000000
--- a/src/action/std/athena/building/dequeue.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-# dequeue a building action
-
-# int baseId 		id de la base orbitale
-# int building 	 	id du bâtiment
-
-use App\Classes\Library\Utils;
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\FormException;
-use App\Classes\Exception\ErrorException;
-use App\Modules\Athena\Model\BuildingQueue;
-
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$request = $this->getContainer()->get('app.request');
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$buildingQueueManager = $this->getContainer()->get(\App\Modules\Athena\Manager\BuildingQueueManager::class);
-$buildingResourceRefund = $this->getContainer()->getParameter('athena.building.building_queue_resource_refund');
-$entityManager = $this->getContainer()->get(\App\Classes\Entity\EntityManager::class);
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$baseId = $request->query->get('baseid');
-$building = $request->query->get('building');
-
-
-if ($baseId !== FALSE AND $building !== FALSE AND in_array($baseId, $verif)) {
-	if ($orbitalBaseHelper->isABuilding($building)) {
-		if (($ob = $orbitalBaseManager->getPlayerBase($baseId, $session->get('playerId'))) !== null) {
-			$buildingQueues = $buildingQueueManager->getBaseQueues($baseId);
-
-			$index = NULL;
-			$nbBuildingQueues = count($buildingQueues);
-			for ($i = 0; $i < $nbBuildingQueues; $i++) {
-				$queue = $buildingQueues[$i]; 
-				# get the last element from the correct building
-				if ($queue->buildingNumber == $building) {
-					$index = $i;
-					$targetLevel = $queue->targetLevel;
-					$dStart = $queue->dStart;
-				}
-			}
-
-			# if it's the first, the next must restart by now
-			if ($index == 0) {
-				$dStart = Utils::now();
-			}
-
-			if ($index !== NULL) {
-				# shift
-				for ($i = $index + 1; $i < $nbBuildingQueues; $i++) {
-					$queue = $buildingQueues[$i];
-
-					$oldDate = $queue->dEnd;
-					$queue->dEnd = Utils::addSecondsToDate($dStart, Utils::interval($queue->dStart, $queue->dEnd, 's'));
-					$queue->dStart = $dStart;
-
-					// @TODO handle rescheduling
-					// $scheduler->reschedule($queue, $queue->dEnd, $oldDate);
-
-					$dStart = $queue->dEnd;
-				}
-
-				// @TODO handle cancellation
-				// $scheduler->cancel($buildingQueues[$index], $buildingQueues[$index]->dEnd);
-				$entityManager->remove($buildingQueues[$index]);
-				$entityManager->flush(BuildingQueue::class);
-
-				// give the resources back
-				$resourcePrice = $orbitalBaseHelper->getBuildingInfo($building, 'level', $targetLevel, 'resourcePrice');
-				$resourcePrice *= $buildingResourceRefund;
-				$orbitalBaseManager->increaseResources($ob, $resourcePrice, TRUE);
-				$session->addFlashbag('Construction annulée, vous récupérez le ' . $buildingResourceRefund * 100 . '% du montant investi pour la construction', Flashbag::TYPE_SUCCESS);
-			} else {
-				throw new ErrorException('suppression de bâtiment impossible');
-			}
-		} else {
-			throw new ErrorException('cette base ne vous appartient pas');
-		}
-	} else {
-		throw new ErrorException('le bâtiment indiqué n\'est pas valide');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour annuler la construction d\'un bâtiment');
-}
diff --git a/src/views/components/bases/ob/generator.php b/src/views/components/bases/ob/generator.php
deleted file mode 100755
index 2926b5a85..000000000
--- a/src/views/components/bases/ob/generator.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-# generator component
-# in athena.bases package
-
-# affichage du générateur
-
-# require
-	# {orbitalBase}		ob_generator
-
-# work
-
-use App\Classes\Library\Utils;
-use App\Classes\Library\Format;
-use App\Classes\Library\Chronos;
-use App\Modules\Zeus\Model\PlayerBonus;
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-
-$container = $this->getContainer();
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$buildingQueueManager = $this->getContainer()->get(\App\Modules\Athena\Manager\BuildingQueueManager::class);
-$technologyManager = $this->getContainer()->get(\App\Modules\Promethee\Manager\TechnologyManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$buildingResourceRefund = $this->getContainer()->getParameter('athena.building.building_queue_resource_refund');
-$sessionToken = $session->get('token');
-$mediaPath = $container->getParameter('media');
-
-$q = '';
-$b = array('', '', '', '', '', '', '', '', '', '');
-$realSizeQueue = 0;
-
-for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-	$name 		= ucfirst($orbitalBaseHelper->getBuildingInfo($i, 'name'));
-	$aLevel[$i] = intval(call_user_func(array($ob_generator, 'getLevel' . $name)));
-	$rLevel[$i] = intval(call_user_func(array($ob_generator, 'getReal' . $name . 'Level')));
-}
-
-# queue
-
-$q .= '<div class="queue">';
-$nextTime = 0;
-$nextTotalTime = 0;
-
-for ($i = 0; $i < $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::GENERATOR, 'level', $ob_generator->levelGenerator, 'nbQueues'); $i++) {
-	if (isset($ob_generator->buildingQueues[$i])) {
-		$qe = $ob_generator->buildingQueues[$i];
-
-		$realSizeQueue++;
-		$nextTime = Utils::interval(Utils::now(), $qe->dEnd, 's');
-		$nextTotalTime += $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'level', $qe->targetLevel, 'time');
-
-		$q .= '<div class="item ' . (($realSizeQueue > 1) ? 'active' : '') . ' progress" data-progress-output="lite" data-progress-current-time="' . $nextTime . '" data-progress-total-time="' . $nextTotalTime . '">';
-		$q .= '<a href="' . Format::actionBuilder('dequeuebuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $qe->buildingNumber]) . '"' . 
-				'class="button hb lt" title="annuler la construction (attention, vous ne récupérerez que ' . $buildingResourceRefund * 100 . '% du montant investi)">×</a>';
-		$q .= '<img class="picto" src="' . $mediaPath . 'orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'imageLink') . '.png" alt="" />';
-		$q .= '<strong>';
-			$q .= $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'frenchName');
-			$q .= ' <span class="level">niv. ' . $qe->targetLevel . '</span>';
-		$q .= '</strong>';
-		if ($realSizeQueue > 1) {
-			$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>';
-			$q .= '<span class="progress-container"></span>';
-		} else {
-			$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>';
-
-			$q .= '<span class="progress-container">';
-				$q .= '<span style="width: ' . Format::percent($nextTotalTime - $nextTime, $nextTotalTime) . '%;" class="progress-bar">';
-				$q .='</span>';
-			$q .= '</span>';
-		}
-		$q .= '</div>';
-	} else {
-		$q .= '<div class="item empty">';
-			$q .= '<span class="picto"></span>';
-			$q .= '<strong>Emplacement libre</strong>';
-			$q .= '<span class="progress-container"></span>';
-		$q .= '</div>';
-	}
-}
-$q .= '</div>';
-
-
-# building
-$technology = $technologyManager->getPlayerTechnology($session->get('playerId'));
-for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-	$level = $aLevel[$i];
-	$nextLevel =  $rLevel[$i] + 1;
-
-	$b[$i] .= ($rLevel[$i]) ? '<div class="build-item">' : '<div class="build-item disable">';
-		$b[$i] .= '<div class="name">';
-			$b[$i] .= '<img src="' . $mediaPath . 'orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($i, 'imageLink') . '.png" alt="" />';
-			$b[$i] .= '<strong>' . $orbitalBaseHelper->getBuildingInfo($i, 'frenchName') . '</strong>';
-			if ($level != 0) {
-				$b[$i] .= '<span class="level hb lt" title="niveau actuel">' . $level . '</span>';
-			}
-			$b[$i] .= '<a href="#" class="addInfoPanel info hb lt" title="plus d\'info" data-building-id="' . $i . '" data-info-type="building" data-building-current-level="' . $level . '">+</a>';
-		$b[$i] .= '</div>';
-
-		$price = Format::numberFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice'), -1) . ' <img src="' .  $mediaPath. 'resources/resource.png" alt="ressources" class="icon-color" />';
-		$time  = Chronos::secondToFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'time'), 'lite') . ' <img src="' .  $mediaPath. 'resources/time.png" alt="relèves" class="icon-color" />';
-
-		if (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'buildingTree', $ob_generator)) !== TRUE) {
-			if ($answer == 'niveau maximum atteint') {
-				$b[$i] .= '<span class="button disable">';
-					$b[$i] .= '<span class="text">';
-						$b[$i] .= 'construction impossible<br/>';
-						$b[$i] .= 'niveau maximum atteint';
-					$b[$i] .= '</span>';
-				$b[$i] .= '</span>';
-			} else {
-				$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">';
-					$b[$i] .= '<span class="text">';
-						$b[$i] .= 'construction impossible<br/>';
-						$b[$i] .= $price . ' | ' . $time;
-					$b[$i] .= '</span>';
-				$b[$i] .= '</span>';
-			}
-		} elseif (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'techno', $technology)) !== TRUE) {
-			$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">';
-				$b[$i] .= '<span class="text">';
-					$b[$i] .= 'construction impossible<br/>';
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-			$b[$i] .= '</span>';
-		} elseif (!$orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $aLevel[OrbitalBaseResource::GENERATOR], 'queue', $realSizeQueue)) {
-			$b[$i] .= '<span class="button disable hb lt" title="file de construction pleine, revenez dans un moment">';
-				$b[$i] .= '<span class="text">';
-					$b[$i] .= 'construction impossible<br/>';
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-			$b[$i] .= '</span>';
-		} elseif (!$orbitalBaseHelper->haveRights($i, $nextLevel, 'resource', $ob_generator->getResourcesStorage())) {
-			$missingResource = $orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice') - $ob_generator->getResourcesStorage();
-			$b[$i] .= '<span class="button disable hb lt" title="pas assez de ressources, il manque ' . Format::numberFormat($missingResource) . ' ressource' . Format::plural($missingResource) . '">';
-				$b[$i] .= '<span class="text">';
-					$b[$i] .= 'construction impossible<br/>';
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-			$b[$i] .= '</span>';
-		} else {
-			$b[$i] .= '<a class="button" href="' . Format::actionBuilder('buildbuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $i]) . '">';
-				$b[$i] .= '<span class="text">';
-					$b[$i] .= 'augmenter vers le niveau ' . $nextLevel . '<br/>';
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>';
-			$b[$i] .= '</a>';
-		}
-	$b[$i] .= '</div>';
-}
-
-# display
-echo '<div class="component">';
-	echo '<div class="head skin-1">';
-		echo '<img src="' . $mediaPath . 'orbitalbase/generator.png" alt="" />';
-		echo '<h2>' . $orbitalBaseHelper->getBuildingInfo(0, 'frenchName') . '</h2>';
-		echo '<em>niveau ' . $ob_generator->getLevelGenerator() . '</em>';
-	echo '</div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<div class="number-box ' . (($session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED) == 0) ? 'grey' : '') . '">';
-				echo '<span class="label">bonus de vitesse de construction</span>';
-				echo '<span class="value">';
-					echo Format::numberFormat($session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED)) . ' %';
-				echo '</span>';
-			echo '</div>';
-			
-			echo '<h4>File de construction</h4>';
-			echo $q;
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-echo '<div class="component generator">';
-	echo '<div class="head"></div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<h4>Bâtiments neutres</h4>';
-			echo $b[0];
-			echo $b[5];
-			echo $b[7];
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-echo '<div class="component generator">';
-	echo '<div class="head"></div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<h4>Bâtiments commerciaux</h4>';
-			echo $b[1];
-			echo $b[6];
-			echo $b[9];
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-echo '<div class="component generator">';
-	echo '<div class="head"></div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<h4>Bâtiments militaires</h4>';
-			echo $b[2];
-			echo $b[8];
-			echo $b[3];
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-echo '<div class="component">';
-	echo '<div class="head skin-2">';
-		echo '<h2>À propos</h2>';
-	echo '</div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<p class="long-info">' . $orbitalBaseHelper->getBuildingInfo(0, 'description') . '</p>';
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
diff --git a/templates/components/base/building_queues.html.twig b/templates/components/base/building_queues.html.twig
new file mode 100644
index 000000000..72e7d4d31
--- /dev/null
+++ b/templates/components/base/building_queues.html.twig
@@ -0,0 +1,23 @@
+<div class="queue">
+	{% set next_total_time = 0 %}
+
+	{% set building_queues_count = current_base.buildingQueues|length %}
+
+	{% for building_queue in current_base.buildingQueues %}
+		{% set next_total_time = next_total_time + get_building_info(building_queue.buildingNumber, 'level', building_queue.targetLevel, 'time') %}
+
+		{{ include('molecules/base/building_queue.html.twig', {
+			building_queues_count,
+			building_queue,
+			next_total_time,
+		}) }}
+	{% endfor %}
+
+	{% for i in range(building_queues_count, get_building_info(generator_building_number, 'level', current_base.levelGenerator, 'nbQueues') - 1) %}
+		<div class="item empty">
+			<span class="picto"></span>
+			<strong>Emplacement libre</strong>
+			<span class="progress-container"></span>
+		</div>
+	{% endfor %}
+</div>
diff --git a/templates/molecules/base/building_card.html.twig b/templates/molecules/base/building_card.html.twig
new file mode 100644
index 000000000..8a2ae4e37
--- /dev/null
+++ b/templates/molecules/base/building_card.html.twig
@@ -0,0 +1,70 @@
+<div class="build-item {% if not building_data.real_level %}disable{% endif %}">
+	<div class="name">
+		<img src="{{ asset('media/orbitalbase/' ~ get_building_info(building_number, 'imageLink') ~ '.png') }}" alt="" />
+		<strong>{{ get_building_info(building_number, 'frenchName') }}</strong>
+		{% if building_data.level > 0 %}
+			<span class="level hb lt" title="niveau actuel">{{ building_data.level }}</span>
+		{% endif %}
+		<a href="#" class="addInfoPanel info hb lt"
+		   title="plus d\'info"
+		   data-building-id="{{ building_number }}"
+		   data-info-type="building"
+		   data-building-current-level="{{ building_data.level }}">+</a>
+	</div>
+	{% set price %}
+		{{ get_building_info(building_number, 'level', (building_data.next_level), 'resourcePrice')|number(-1) }}
+		<img src="{{ asset('media/resources/resource.png') }}" alt="ressources" class="icon-color" />
+	{% endset %}
+	{% set time %}
+		{{ get_building_info(building_number, 'level', (building_data.next_level), 'time')|lite_seconds }}
+		<img src="{{ asset('media/resources/time.png') }}" alt="relèves" class="icon-color" />
+	{% endset %}
+
+	{% if building_data.building_requirements is not same as(true) %}
+		{% if 'niveau maximum atteint' == building_data.building_requirements %}
+			<span class="button disable">
+				<span class="text">
+					construction impossible<br/>
+					niveau maximum atteint
+				</span>
+			</span>
+		{% else %}
+			<span class="button disable hb lt" title="{{ building_data.building_requirements }}">
+				<span class="text">
+					construction impossible<br/>
+					{{ price }} | {{ time }}
+				</span>
+			</span>
+		{% endif %}
+	{% elseif building_data.technology_requirements is not same as(true) %}
+		<span class="button disable hb lt" title="{{ building_data.technology_requirements }}">
+			<span class="text">
+				construction impossible<br/>
+				{{ price }} | {{ time }}
+			</span>
+		</span>
+	{% elseif true != building_data.queue_requirements %}
+		<span class="button disable hb lt" title="file de construction pleine, revenez dans un moment">
+			<span class="text">
+				construction impossible<br/>
+				{{ price }} | {{ time }}
+			</span>
+		</span>
+	{% elseif true != building_data.resources_requirements %}
+		{% set missing_resources = get_building_info(building_number, 'level', (building_data.next_level), 'resourcePrice') - current_base.resourcesStorage %}
+		<span class="button disable hb lt" title="pas assez de ressources, il manque {{ missing_resources|number }} ressource{{ missing_resources|plural }}">
+			<span class="text">
+				construction impossible<br/>
+				{{ price }} | {{ time }}
+			</span>
+		</span>
+	{% else %}
+		<a class="button" href="{{ path('build', { 'identifier': building_number }) }}">
+			<span class="text">
+				augmenter vers le niveau {{ building_data.next_level }}<br/>
+				{{ price }} | {{ time }}
+			</span>
+		</a>
+	{% endif %}
+</div>
+
diff --git a/templates/molecules/base/building_queue.html.twig b/templates/molecules/base/building_queue.html.twig
new file mode 100644
index 000000000..2b02f0f35
--- /dev/null
+++ b/templates/molecules/base/building_queue.html.twig
@@ -0,0 +1,26 @@
+{% set next_time = building_queue|queue_duration %}
+
+<div class="item {% if building_queues_count > 1 %}active{% endif %} progress"
+	 data-progress-output="lite"
+	 data-progress-current-time="{{ next_time }}"
+	 data-progress-total-time="{{ next_total_time }}">
+	<a href="{{ path('cancel_building_queue', { 'identifier': building_queue.buildingNumber }) }}"
+	   class="button hb lt"
+	   title="annuler la construction (attention, vous ne récupérerez que {{ building_resource_refund * 100 }}% du montant investi)">×</a>
+	<img class="picto" src="{{ asset('media/orbitalbase/' ~ get_building_info(building_queue.buildingNumber, 'imageLink') ~ '.png') }}" alt="" />
+	<strong>
+		{{ get_building_info(building_queue.buildingNumber, 'frenchName') }}
+		 <span class="level">niv. {{ building_queue.targetLevel }}</span>
+	</strong>
+	{% if building_queues_count > 1 %}
+		<em><span class="progress-text">{{ next_time|lite_seconds }}</span></em>
+		<span class="progress-container"></span>
+	{% else %}
+		<em><span class="progress-text">'{{ next_time|lite_seconds }}</span></em>
+
+		<span class="progress-container">
+			<span style="width: {{ (next_total_time - next_time)|percent(next_total_time) }}%;" class="progress-bar">
+			</span>
+		</span>
+	{% endif %}
+</div>
diff --git a/templates/pages/athena/generator.html.twig b/templates/pages/athena/generator.html.twig
index 61afd0514..b9fe0398f 100644
--- a/templates/pages/athena/generator.html.twig
+++ b/templates/pages/athena/generator.html.twig
@@ -1,156 +1,46 @@
-$q = '
-$b = array('', '', '', '', '', '', '', '', '', '');
-$realSizeQueue = 0;
+{% extends 'layouts/athena/current_base.html.twig' %}
 
-for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-$name 		= ucfirst($orbitalBaseHelper->getBuildingInfo($i, 'name'));
-$aLevel[$i] = intval(call_user_func(array($ob_generator, 'getLevel' . $name)));
-$rLevel[$i] = intval(call_user_func(array($ob_generator, 'getReal' . $name . 'Level')));
-}
+{% set generator_building_number = constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::GENERATOR') %}
 
-# queue
-
-$q .= '<div class="queue">
-	$nextTime = 0;
-	$nextTotalTime = 0;
-
-	for ($i = 0; $i < $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::GENERATOR, 'level', $ob_generator->levelGenerator, 'nbQueues'); $i++) {
-	if (isset($ob_generator->buildingQueues[$i])) {
-	$qe = $ob_generator->buildingQueues[$i];
-
-	$realSizeQueue++;
-	$nextTime = Utils::interval(Utils::now(), $qe->dEnd, 's');
-	$nextTotalTime += $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'level', $qe->targetLevel, 'time');
-
-	$q .= '<div class="item ' . (($realSizeQueue > 1) ? 'active' : '') . ' progress" data-progress-output="lite" data-progress-current-time="' . $nextTime . '" data-progress-total-time="' . $nextTotalTime . '">
-		$q .= '<a href="' . Format::actionBuilder('dequeuebuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $qe->buildingNumber]) . '"' .
-		'class="button hb lt" title="annuler la construction (attention, vous ne récupérerez que ' . $buildingResourceRefund * 100 . '% du montant investi)">×</a>
-		$q .= '<img class="picto" src="{{ asset('media/orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'imageLink') . '.png') }}" alt="" />
-		$q .= '<strong>
-			$q .= $orbitalBaseHelper->getBuildingInfo($qe->buildingNumber, 'frenchName');
-			$q .= ' <span class="level">niv. ' . $qe->targetLevel . '</span>
-			$q .= '</strong>
-		if ($realSizeQueue > 1) {
-		$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>
-		$q .= '<span class="progress-container"></span>
-		} else {
-		$q .= '<em><span class="progress-text">' . Chronos::secondToFormat($nextTime, 'lite') . '</span></em>
-
-		$q .= '<span class="progress-container">
-				$q .= '<span style="width: ' . Format::percent($nextTotalTime - $nextTime, $nextTotalTime) . '%;" class="progress-bar">
-				$q .='</span>
-			$q .= '</span>
-		}
-		$q .= '</div>
-	} else {
-	$q .= '<div class="item empty">
-		$q .= '<span class="picto"></span>
-		$q .= '<strong>Emplacement libre</strong>
-		$q .= '<span class="progress-container"></span>
-		$q .= '</div>
-	}
-	}
-	$q .= '</div>
-
-
-# building
-$technology = $technologyManager->getPlayerTechnology($session->get('playerId'));
-for ($i = 0; $i < OrbitalBaseResource::BUILDING_QUANTITY; $i++) {
-$level = $aLevel[$i];
-$nextLevel =  $rLevel[$i] + 1;
-
-$b[$i] .= ($rLevel[$i]) ? '<div class="build-item">' : '<div class="build-item disable">
-		$b[$i] .= '<div class="name">
-			$b[$i] .= '<img src="{{ asset('media/orbitalbase/' . $orbitalBaseHelper->getBuildingInfo($i, 'imageLink') . '.png') }}" alt="" />
-			$b[$i] .= '<strong>' . $orbitalBaseHelper->getBuildingInfo($i, 'frenchName') . '</strong>
-			if ($level != 0) {
-			$b[$i] .= '<span class="level hb lt" title="niveau actuel">' . $level . '</span>
-			}
-			$b[$i] .= '<a href="#" class="addInfoPanel info hb lt" title="plus d\'info" data-building-id="' . $i . '" data-info-type="building" data-building-current-level="' . $level . '">+</a>
-			$b[$i] .= '</div>
-
-		$price = Format::numberFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice'), -1) . ' <img src="' .  $mediaPath. 'resources/resource.png') }}" alt="ressources" class="icon-color" />
-		$time  = Chronos::secondToFormat($orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'time'), 'lite') . ' <img src="' .  $mediaPath. 'resources/time.png') }}" alt="relèves" class="icon-color" />
-
-		if (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'buildingTree', $ob_generator)) !== TRUE) {
-		if ($answer == 'niveau maximum atteint') {
-		$b[$i] .= '<span class="button disable">
-					$b[$i] .= '<span class="text">
-						$b[$i] .= 'construction impossible<br/>
-						$b[$i] .= 'niveau maximum atteint
-					$b[$i] .= '</span>
-				$b[$i] .= '</span>
-		} else {
-		$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">
-					$b[$i] .= '<span class="text">
-						$b[$i] .= 'construction impossible<br/>
-						$b[$i] .= $price . ' | ' . $time;
-					$b[$i] .= '</span>
-				$b[$i] .= '</span>
-		}
-		} elseif (($answer = $orbitalBaseHelper->haveRights($i, $nextLevel, 'techno', $technology)) !== TRUE) {
-		$b[$i] .= '<span class="button disable hb lt" title="' . $answer . '">
-				$b[$i] .= '<span class="text">
-					$b[$i] .= 'construction impossible<br/>
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>
-			$b[$i] .= '</span>
-		} elseif (!$orbitalBaseHelper->haveRights(OrbitalBaseResource::GENERATOR, $aLevel[OrbitalBaseResource::GENERATOR], 'queue', $realSizeQueue)) {
-		$b[$i] .= '<span class="button disable hb lt" title="file de construction pleine, revenez dans un moment">
-				$b[$i] .= '<span class="text">
-					$b[$i] .= 'construction impossible<br/>
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>
-			$b[$i] .= '</span>
-		} elseif (!$orbitalBaseHelper->haveRights($i, $nextLevel, 'resource', $ob_generator->getResourcesStorage())) {
-		$missingResource = $orbitalBaseHelper->getBuildingInfo($i, 'level', ($nextLevel), 'resourcePrice') - $ob_generator->getResourcesStorage();
-		$b[$i] .= '<span class="button disable hb lt" title="pas assez de ressources, il manque ' . Format::numberFormat($missingResource) . ' ressource' . Format::plural($missingResource) . '">
-				$b[$i] .= '<span class="text">
-					$b[$i] .= 'construction impossible<br/>
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>
-			$b[$i] .= '</span>
-		} else {
-		$b[$i] .= '<a class="button" href="' . Format::actionBuilder('buildbuilding', $sessionToken, ['baseid' => $ob_generator->getId(), 'building' => $i]) . '">
-			$b[$i] .= '<span class="text">
-					$b[$i] .= 'augmenter vers le niveau ' . $nextLevel . '<br/>
-					$b[$i] .= $price . ' | ' . $time;
-				$b[$i] .= '</span>
-			$b[$i] .= '</a>
-		}
-		$b[$i] .= '</div>
-	}
-
-	# display
+{% block content %}
 	<div class="component">
 		<div class="head skin-1">
 			<img src="{{ asset('media/orbitalbase/generator.png') }}" alt="" />
-			<h2>' . $orbitalBaseHelper->getBuildingInfo(0, 'frenchName') . '</h2>
-			<em>niveau ' . $ob_generator->getLevelGenerator() . '</em>
-			</div>
+			<h2>{{ get_building_info(0, 'frenchName') }}</h2>
+			<em>niveau {{ current_base.levelGenerator }}</em>
+		</div>
 		<div class="fix-body">
 			<div class="body">
-				<div class="number-box ' . (($session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED) == 0) ? 'grey' : '') . '">
+				<div class="number-box {% if generator_speed_bonus == 0 %}grey{% endif %}">
 					<span class="label">bonus de vitesse de construction</span>
 					<span class="value">
-					echo Format::numberFormat($session->get('playerBonus')->get(PlayerBonus::GENERATOR_SPEED)) . ' %
-				</span>
-					</div>
+						{{ generator_speed_bonus|number }} %
+					</span>
+				</div>
 
 				<h4>File de construction</h4>
-				echo $q;
-				</div>
+				{{ include('components/base/building_queues.html.twig') }}
 			</div>
 		</div>
+	</div>
 
 	<div class="component generator">
 		<div class="head"></div>
 		<div class="fix-body">
 			<div class="body">
 				<h4>Bâtiments neutres</h4>
-				echo $b[0];
-				echo $b[5];
-				echo $b[7];
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::GENERATOR'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::GENERATOR')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::TECHNOSPHERE'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::TECHNOSPHERE')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::STORAGE'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::STORAGE')],
+				}) }}
 				</div>
 			</div>
 		</div>
@@ -160,32 +50,51 @@ $b[$i] .= ($rLevel[$i]) ? '<div class="build-item">' : '<div class="build-item d
 		<div class="fix-body">
 			<div class="body">
 				<h4>Bâtiments commerciaux</h4>
-				echo $b[1];
-				echo $b[6];
-				echo $b[9];
-				</div>
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::REFINERY'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::REFINERY')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::COMMERCIAL_PLATEFORME'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::COMMERCIAL_PLATEFORME')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::SPATIOPORT'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::SPATIOPORT')],
+				}) }}
 			</div>
 		</div>
+	</div>
 
 	<div class="component generator">
 		<div class="head"></div>
 		<div class="fix-body">
 			<div class="body">
 				<h4>Bâtiments militaires</h4>
-				echo $b[2];
-				echo $b[8];
-				echo $b[3];
-				</div>
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::DOCK1'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::DOCK1')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::RECYCLING'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::RECYCLING')],
+				}) }}
+				{{ include('molecules/base/building_card.html.twig', {
+					'building_number': constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::DOCK2'),
+					'building_data': buildings_data[constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::DOCK2')],
+				}) }}
 			</div>
 		</div>
+	</div>
 
 	<div class="component">
 		<div class="head skin-2">
 			<h2>À propos</h2>
-			</div>
+		</div>
 		<div class="fix-body">
 			<div class="body">
-				<p class="long-info">' . $orbitalBaseHelper->getBuildingInfo(0, 'description') . '</p>
-				</div>
+				<p class="long-info">{{ get_building_info(generator_building_number, 'description')|raw }}</p>
 			</div>
 		</div>
+	</div>
+{% endblock %}