change the structure to use a gitsubmodule