Move functions to separate package and categorize them a bit