Moved convection functions into specific file