added helper and moved into separate files/folders