Continued new structue, license stuff