Some major cleaning and organizing.
Merge branch 'master' of https://github.com/dominique120/AeiaOTS