Licence fix, better demo and better object structure