The 2dx team needs to make up their mind about the directory structure and stick with it

It’s done again in RC0!
It’s just a huge pain to merge, every time.