reworked project in preparation for Spring integration