refactor app and build process, alpha is close