Finish off restructuring
Update license