Feature/split files

Internal merge to add the split version