Move stub templates to the bottom, #135