More moving of files to make it a root-level module
allow greater configuration flexibility