Changed library's structure; broken helpers into multiple files