Remove src and layout-gen from Branch