Code organization to prepare for double boards