Bugfix: correct folder location of DCA handler class and fix singleton issues.