move helper and storage into own module