package refactoring and working demo
demo works now