Start using main package, again