Move file splitting into parser