Minor adjustments
reorganization
Merge with Jackie
Merge branch 'develop' into endpoints