Converted functions to plugins
Merge branch 'move-functions-to-plugins'