move modules to sub directory
add environment