Source generic functions to common
Update incorrect directory