Since the site.tf is generated by mach-composer-cli moving a component is quite a hassle, you need to generate the tf files, add your moved {} blocks before doing an apply.
Support for moving / renaming components would be nice, can be in the form of a command of with some extra yaml configuration maybe?