cosmetic change
wrap statefull things into App module