Organized a bit better the files
Minor doc
Line formatting