Move and rename directories.
Merge branch 'development'