renamed a few files, updated require paths