Add licensing, re-order specs