move asf to git submodule, fix paths