Backport breaking changes to file structure to 5.4.0, 5.4.1 and 5.4.3.