More refernce fixes (caused by changed file structure)