Move Structure class to exclusive module and implements query. Solve part of #110
Small improvements