#171 Started refactor of function folder