Fix Class PAth Issues - Working