Add Cache files and new structure