Updated references with file structure changes