move App to separate project; some bugs fixed;