Moved helpers & utils to lib