fixes for restructure #294

Closed sunava closed 1 year ago