TODO: Create seperate packages for D10 + D11 - not doable by this commit after having renamed the packages directory and its files.