Added first Gui and refactored packages