fixing module layout to be similar to window_git