Right edition of some files, simplify organization