changing to subtree modules