Move stubs out of main directory