New world order (again)

New file organization and some new functions here and there (I don't
remember).