File structure adjusted

Also updated Extra Cells to 1.6.1 because people insist on interrupting important work and being pushy :3
Config correction for Extra Cells
Exhaustive reorganisation of the XML

No actual changes, just reorganised.