Reorganized and renamed a few files