Move functions to nova package