Move and rename directories.
Merge branch 'development' of github.com:SeriaAS/istribute into development