Re-order API section
Remove bogus dir
Merge branch 'reorder-api'