Moved Keyword providers to seperate project