updated to use new path structure