Submodule restructure, re-workedlayous.