restructure, cleanup