Rejigging file structure and naming.
View tweaks
Cache key hashing implementation