reorganize modules

- remove unused and unnecessary exports/imports