Add working tree and simple layout