DDF-694: Removed webapp directory and moved key components