Add puppi and apache submodule