#281: moved concerns into lib folder