Structuring changes for page and move of cache to /lib/