Restructur modules; clean up imports