Move functions to the right spot