Add Static signer, cleanup dir names