Start to using xautoload to implement D8 DX
Fixing merge