Moving files around to highlight separation from dsl and code tools
Fixing imports after rearrange.