Bug fix - singleton duplication symbol problem - separate class definition and declaration