updated paths to reflect new dir structure