Moved stubs to files