DDF-399 moved application code into a separate module