Did some class and import fixing.