changed paths and renamed a few files