#1 Split app to another file; Rename test