Merge branch 'rework-folders' into 'dev'

refactor: move business logic into separate file

See merge request !24