[IMP] More cleanups about ordering files.
[FIX] Author. IMHO now the module is a totally different module, and we will continue re-writting it, day by day.