Remove orig. assets and tweak folder structure