Add basic app skeleton
Merge from remote