Restructure the directory hierarchy
Prepare to switch to use the sub module
Switch to submodule