Restructure the package hierarchy to have one package per feature in main and one package per corresponding feature in test for later testing implementing.