Re-organised bas folder