[+]reorganize structure