Some more modifications: moving some definitions and adding licence
Updating todo for eric
Strange thing on LICENCE AND TODO