remove Serializable interafce for data classes
fix wrong imports
refactor to get rid of static analysis warnings in the code