rename classes; restructure