change intent structure to two spaces, fix it along all sources