Reorganize assets and cache fixes