Some code rearangement
Merge branch 'master' of https://github.com/AeonGames/AeonGUI