Move calipso modules into their own package.