Further missing package declarations (should build in IntelliJ first ;-)