Cleanup and reorganization
Merge branch 'develop'