Move functions to subfolder