additional cleanup
huge commit: converted app to package structure