Just keep public folder, fix moment