Reorganized package

GUI and Database should be separate packages.