CHANGE: Moved Functions to plugin classes in model/form/filter
CHANGE: Small Fixes