Removed auto generated file headers
Made more classes Serializable and added missing serialVersionUIDs