Code organization. Move structs to it's own module