Reorg pkg in module 05_GUI