Fix failing preload spec
Cleanup dir structure for new asset caching