Create main and test packages, with the rest moved as sub-packages.