Moved functionality to dll project