diff --git a/src/GameState.gd b/src/GameState.gd
index 08b93ef..9ced048 100644
--- a/src/GameState.gd
+++ b/src/GameState.gd
@@ -1,5 +1,7 @@
-extends Node
 class_name GameState
+extends Node
+
+signal state_changed(previous, new)
 
 # https://github.com/GDQuest/godot-demos/blob/master/2018/04-24-finite-state-machine/player_v2/state_machine.gd
 # http://www.gameprogrammingpatterns.com/state.html
@@ -11,8 +13,6 @@ var transitions = {
 	State.GAME_OVER : [ State.MAIN ]
 }
 
-signal state_changed(previous, current)
-
 export(State) var current_state = State.MAIN
 
 func current_state_name() -> String:
diff --git a/src/Piece.gd b/src/Piece.gd
index 497b73f..5df6ba7 100644
--- a/src/Piece.gd
+++ b/src/Piece.gd
@@ -1,6 +1,6 @@
 tool
-extends Node2D
 class_name Piece
+extends Node2D
 
 export var size: int = 160
 
diff --git a/src/Taquin.gd b/src/Taquin.gd
index 7fc1c65..14baf18 100644
--- a/src/Taquin.gd
+++ b/src/Taquin.gd
@@ -1,6 +1,6 @@
 tool
-extends Control
 class_name Taquin
+extends Control
 
 var Piece = preload("res://src/Piece.tscn")