Refactored package structure

34 files changed, 5 insertions, 4 deletions

diff --git a/client/input.go b/pkg/client/input.go
index 8c814a6..8c814a6 100644
--- a/client/input.go
+++ b/pkg/client/input.go
diff --git a/client/input_test.go b/pkg/client/input_test.go
index fe8feeb..f74a097 100644
--- a/client/input_test.go
+++ b/pkg/client/input_test.go
@@ -2,7 +2,7 @@ package client
 
 import (
 	"os"
-	"shell-game-launcher/config"
+	"shell-game-launcher/pkg/config"
 	"testing"
 )
 
diff --git a/client/menu.go b/pkg/client/menu.go
index f6de082..f6de082 100644
--- a/client/menu.go
+++ b/pkg/client/menu.go
diff --git a/client/menu_test.go b/pkg/client/menu_test.go
index 1f70e4e..35964d8 100644
--- a/client/menu_test.go
+++ b/pkg/client/menu_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"reflect"
-	"shell-game-launcher/config"
+	"shell-game-launcher/pkg/config"
 	"testing"
 )
 
diff --git a/client/state.go b/pkg/client/state.go
index 9565efc..576721c 100644
--- a/client/state.go
+++ b/pkg/client/state.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"shell-game-launcher/config"
+	"shell-game-launcher/pkg/config"
 )
 
 type State struct {
diff --git a/client/state_test.go b/pkg/client/state_test.go
index 917c211..917c211 100644
--- a/client/state_test.go
+++ b/pkg/client/state_test.go
diff --git a/config/action.go b/pkg/config/action.go
index c63308e..c63308e 100644
--- a/config/action.go
+++ b/pkg/config/action.go
diff --git a/config/action_test.go b/pkg/config/action_test.go
index dbc6ae3..dbc6ae3 100644
--- a/config/action_test.go
+++ b/pkg/config/action_test.go
diff --git a/config/app.go b/pkg/config/app.go
index 2eefb98..2787517 100644
--- a/config/app.go
+++ b/pkg/config/app.go
@@ -21,6 +21,7 @@ type App struct {
 	MenuMaxIdleTime int `yaml:"MenuMaxIdleTime"`
 	// PostLoginCommands is the list of commands to execute upon login, like creating save directories for games
 	PostLoginCommands []string `yaml:"PostLoginCommands"`
+	// TODO admin contact
 }
 
 func (a *App) validate() error {
diff --git a/config/app_test.go b/pkg/config/app_test.go
index 5a6cf41..5a6cf41 100644
--- a/config/app_test.go
+++ b/pkg/config/app_test.go
diff --git a/config/command.go b/pkg/config/command.go
index 34142cd..34142cd 100644
--- a/config/command.go
+++ b/pkg/config/command.go
diff --git a/config/command_test.go b/pkg/config/command_test.go
index 7e07956..7e07956 100644
--- a/config/command_test.go
+++ b/pkg/config/command_test.go
diff --git a/config/config.go b/pkg/config/config.go
index b68a26a..b68a26a 100644
--- a/config/config.go
+++ b/pkg/config/config.go
diff --git a/config/config_test.go b/pkg/config/config_test.go
index dfa8237..8eb6598 100644
--- a/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -211,7 +211,7 @@ func TestLoadFile(t *testing.T) {
 			},
 		},
 	}
-	config, err = LoadFile("../example/complete.yaml")
+	config, err = LoadFile("../../example/complete.yaml")
 	if err != nil {
 		t.Fatalf("complete example failed with error : %v", err)
 	}
diff --git a/config/game.go b/pkg/config/game.go
index b5f4d39..b5f4d39 100644
--- a/config/game.go
+++ b/pkg/config/game.go
diff --git a/config/game_test.go b/pkg/config/game_test.go
index b3bf107..b3bf107 100644
--- a/config/game_test.go
+++ b/pkg/config/game_test.go
diff --git a/config/menu.go b/pkg/config/menu.go
index 7321c7b..7321c7b 100644
--- a/config/menu.go
+++ b/pkg/config/menu.go
diff --git a/config/menu_test.go b/pkg/config/menu_test.go
index e9abef1..e9abef1 100644
--- a/config/menu_test.go
+++ b/pkg/config/menu_test.go
diff --git a/config/test_data/duplicate_game.yaml b/pkg/config/test_data/duplicate_game.yaml
index f01a017..f01a017 100644
--- a/config/test_data/duplicate_game.yaml
+++ b/pkg/config/test_data/duplicate_game.yaml
diff --git a/config/test_data/duplicate_menu.yaml b/pkg/config/test_data/duplicate_menu.yaml
index 3dbefb7..3dbefb7 100644
--- a/config/test_data/duplicate_menu.yaml
+++ b/pkg/config/test_data/duplicate_menu.yaml
diff --git a/config/test_data/fake_nethack_directory/.keep b/pkg/config/test_data/fake_nethack_directory/.keep
index e69de29..e69de29 100644
--- a/config/test_data/fake_nethack_directory/.keep
+++ b/pkg/config/test_data/fake_nethack_directory/.keep
diff --git a/config/test_data/invalid_app.yaml b/pkg/config/test_data/invalid_app.yaml
index ed236ea..ed236ea 100644
--- a/config/test_data/invalid_app.yaml
+++ b/pkg/config/test_data/invalid_app.yaml
diff --git a/config/test_data/invalid_game.yaml b/pkg/config/test_data/invalid_game.yaml
index d58c3ee..d58c3ee 100644
--- a/config/test_data/invalid_game.yaml
+++ b/pkg/config/test_data/invalid_game.yaml
diff --git a/config/test_data/invalid_menus.yaml b/pkg/config/test_data/invalid_menus.yaml
index 1df5fbf..1df5fbf 100644
--- a/config/test_data/invalid_menus.yaml
+++ b/pkg/config/test_data/invalid_menus.yaml
diff --git a/config/test_data/invalid_yaml b/pkg/config/test_data/invalid_yaml
index db1ddad..db1ddad 100644
--- a/config/test_data/invalid_yaml
+++ b/pkg/config/test_data/invalid_yaml
diff --git a/config/test_data/minimal.yaml b/pkg/config/test_data/minimal.yaml
index 22a0a6c..22a0a6c 100644
--- a/config/test_data/minimal.yaml
+++ b/pkg/config/test_data/minimal.yaml
diff --git a/config/test_data/no_anonymous_menu.yaml b/pkg/config/test_data/no_anonymous_menu.yaml
index a015160..a015160 100644
--- a/config/test_data/no_anonymous_menu.yaml
+++ b/pkg/config/test_data/no_anonymous_menu.yaml
diff --git a/config/test_data/no_logged_in_menu.yaml b/pkg/config/test_data/no_logged_in_menu.yaml
index 43d0054..43d0054 100644
--- a/config/test_data/no_logged_in_menu.yaml
+++ b/pkg/config/test_data/no_logged_in_menu.yaml
diff --git a/config/test_data/non_existant_chopts.yaml b/pkg/config/test_data/non_existant_chopts.yaml
index d3f796d..d3f796d 100644
--- a/config/test_data/non_existant_chopts.yaml
+++ b/pkg/config/test_data/non_existant_chopts.yaml
diff --git a/config/test_data/non_existant_game.yaml b/pkg/config/test_data/non_existant_game.yaml
index 9bf6a38..9bf6a38 100644
--- a/config/test_data/non_existant_game.yaml
+++ b/pkg/config/test_data/non_existant_game.yaml
diff --git a/config/test_data/non_existant_menu.yaml b/pkg/config/test_data/non_existant_menu.yaml
index f0f30a3..f0f30a3 100644
--- a/config/test_data/non_existant_menu.yaml
+++ b/pkg/config/test_data/non_existant_menu.yaml
diff --git a/config/test_data/not_enough_menus.yaml b/pkg/config/test_data/not_enough_menus.yaml
index f585f44..f585f44 100644
--- a/config/test_data/not_enough_menus.yaml
+++ b/pkg/config/test_data/not_enough_menus.yaml
diff --git a/config/test_data/unreachable_game.yaml b/pkg/config/test_data/unreachable_game.yaml
index f2f22e2..f2f22e2 100644
--- a/config/test_data/unreachable_game.yaml
+++ b/pkg/config/test_data/unreachable_game.yaml
diff --git a/config/test_data/unreachable_menu.yaml b/pkg/config/test_data/unreachable_menu.yaml
index f947cf7..f947cf7 100644
--- a/config/test_data/unreachable_menu.yaml
+++ b/pkg/config/test_data/unreachable_menu.yaml