rearrange module directories
modified module importing macros