Moved the functions to a better directory.