restucture to match the warbler layout