changed directory structure and supplied new make file