1.Added license
2.Some changes to convention