Dexfile folder structure changes

And a whole lot more.