Fixed paths broken from changing file structure