upd: move non-library code to application-base