Re-organizes classes, creates wrappers.