Move assets into their own folder
More cleanup