Organized group structure in project.
Merge branch 'master' into canvas_adjust