Added directory layout xml etc