Include submoule and change folder organization