moved and renamed a few files