evicting cache

and moving stuff around