reorganize structure

:lock: