Can now generate the same package as before, but with the new project structure. Restructuring complete.