FileOrganization branch:
Create groups in project navigator
Reorder functions and properties in source files
Merge branch 'FileOrganization'