Refactor - Move function to their rightful namespace