Revert "functions separated"

This reverts commit 8f51cdf399eaf56fdb177bba73f54101cacb4b54.