Reorganize imports. Change classe that need implements Serializable