Moving funcs/ into src/