reorganizing assets and fixing cache loading