Reorganised assets folder, with beginnings of Guard-based workflow