Reorganizing files
Some corrections and license updated