renamed some files; hw cache is mostly implemented