change code to reflect directory structure