Move and rename directories.
Fix path reference due to moving around the dirs.
Merge commit 'ea1656ff570107a738d0df2af0dab5c852e779ee' into development