Move and rename directories.
Merge commit 'e0efe5df0a57e73716f76646f08a77fd2ed8015a' into development