import refactoring and serialVersionUID's