Solve conflict.
Reorganize external modules files to remove artificial sub-hierachies.