Package refactoring
Add test GUI, misc