fix issues with last commit
convert app to package structure / fixes #2