rename files and structs, clean code.