Breaking out completion into multiple files