Move functions to separated project