Refactor asset directory