Sync skel and app directories.

Closes #1698