Rename app dir to application dir, before merging this branch into dev-master