Move the structure definition on a better place