File structure changes and reference fix for Jasmine